Browse Source

fix gpg expired bug when time is zero (#3584)

for-closed-social
Lunny Xiao 6 years ago
committed by Lauris BH
parent
commit
769ab1e424
2 changed files with 6 additions and 1 deletions
  1. +5
    -0
      modules/util/time_stamp.go
  2. +1
    -1
      templates/user/settings/keys_gpg.tmpl

+ 5
- 0
modules/util/time_stamp.go View File

@ -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()
}

+ 1
- 1
templates/user/settings/keys_gpg.tmpl View File

@ -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>

Loading…
Cancel
Save