Skip to content

Fix wording #2024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
appleboy merged 3 commits into from
Jun 24, 2017
Merged

Fix wording #2024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8079762
Fix wording
pgaskin Jun 20, 2017
1ae0f32
Update locale_en-US.ini
pgaskin Jun 23, 2017
9c82615
Update keys_gpg.tmpl
pgaskin Jun 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/keys_gpg.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down