core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change `valid_until` translation to `valid_until_date` and include placeholder for the date (#24563) 

- Similar to #24550
- Similar to #24562 

The correct thing to do is to translate the entire phrase into a single
string. The previous translation assumed all languages have a space
between the "valid until" and the date (and that "valid until" comes
before the date).

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
This commit is contained in:
Yarden Shoham 2023-05-06 15:37:02 +03:00 committed by GitHub
parent ef92459e18
commit 95e2e3aa30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options/locale/locale_en-US.ini
View File

@ -755,7 +755,7 @@ ssh_key_deletion_success = The SSH key has been removed.
gpg_key_deletion_success = The GPG key has been removed. gpg_key_deletion_success = The GPG key has been removed.
ssh_principal_deletion_success = The principal has been removed. ssh_principal_deletion_success = The principal has been removed.
add_on = Added on add_on = Added on
valid_until = Valid until valid_until_date = Valid until %s
valid_forever = Valid forever valid_forever = Valid forever
last_used = Last used on last_used = Last used on
no_activity = No recent activity no_activity = No recent activity

2
templates/user/settings/keys_gpg.tmpl
View File

@ -70,7 +70,7 @@
<div class="activity meta"> <div class="activity meta">
<i>{{$.locale.Tr "settings.add_on"}} <span>{{DateTime "short" .AddedUnix}}</span></i> <i>{{$.locale.Tr "settings.add_on"}} <span>{{DateTime "short" .AddedUnix}}</span></i>
- -
<i>{{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until"}} <span>{{DateTime "short" .ExpiredUnix}}</span>{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}</i> <i>{{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until_date" (DateTime "short" .ExpiredUnix) | Safe}}{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}</i>
</div> </div>
</div> </div>
</div> </div>