diff options
| -rw-r--r-- | modules/util/time_stamp.go | 5 | ||||
| -rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/modules/util/time_stamp.go b/modules/util/time_stamp.go index a03560b24f..56f41882f5 100644 --- a/modules/util/time_stamp.go +++ b/modules/util/time_stamp.go @@ -59,3 +59,8 @@ func (ts TimeStamp) FormatLong() string { func (ts TimeStamp) FormatShort() string { return ts.Format("Jan 02, 2006") } + +// IsZero is zero time +func (ts TimeStamp) IsZero() bool { + return ts.AsTime().IsZero() +} diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index ac3fc3ee61..c2af8554cd 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>{{.AddedUnix.FormatShort}}</span></i> - - <i>{{if .ExpiredUnix}}{{$.i18n.Tr "settings.valid_until"}} <span>{{.ExpiredUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i> + <i>{{if not .ExpiredUnix.IsZero}}{{$.i18n.Tr "settings.valid_until"}} <span>{{.ExpiredUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i> </div> </div> </div> |