diff options
| author | Patrick G <geek1011@outlook.com> | 2017-06-24 06:37:03 +0000 |
|---|---|---|
| committer | Bo-Yi Wu <appleboy.tw@gmail.com> | 2017-06-24 01:37:03 -0500 |
| commit | bf187304dc1c03e003dc972e36d9e087c78df57a (patch) | |
| tree | f2ddef521a44843f86a4c71505821d791c583558 | |
| parent | f2afed3098973eb70ecf61c7e3bf7203bf3f592a (diff) | |
| download | gitea-bf187304dc1c03e003dc972e36d9e087c78df57a.tar.gz gitea-bf187304dc1c03e003dc972e36d9e087c78df57a.zip | |
Fix wording (#2024)
* Fix wording
* Update locale_en-US.ini
* Update keys_gpg.tmpl
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 | ||||
| -rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8df828091d..0cbb32df11 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -383,7 +383,7 @@ ssh_key_deletion_success = The SSH key has been deleted. gpg_key_deletion_success = The GPG key has been deleted. add_on = Added on valid_until = Valid until -never = never +valid_forever = Valid forever last_used = Last used on no_activity = No recent activity key_state_desc = This key has been used in the last 7 days diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index a20bc8e140..6d30bc7331 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -26,7 +26,7 @@ <div class="activity meta"> <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Added}}</span></i> - - <i>{{$.i18n.Tr "settings.valid_until"}} <span>{{if not .Expired.IsZero }}{{DateFmtShort .Expired}}{{else}}{{$.i18n.Tr "settings.never"}}{{end}}</span></i> + <i>{{if not .Expired.IsZero }}{{$.i18n.Tr "settings.valid_until"}} <span>{{DateFmtShort .Expired}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i> </div> </div> </div> |