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

lafriks · appleboy · commit adbf576a6e08 · 2018-05-02T15:23:07.000+08:00
diff --git 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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -59,3 +59,8 @@ func (ts TimeStamp) FormatLong() string {`
`59`	`59`	`func (ts TimeStamp) FormatShort() string {`
`60`	`60`	`return ts.Format("Jan 02, 2006")`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+// IsZero is zero time`
	`64`	`+func (ts TimeStamp) IsZero() bool {`
	`65`	`+ return ts.AsTime().IsZero()`
	`66`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`<div class="activity meta">`
`27`	`27`	`<i>{{$.i18n.Tr "settings.add_on"}} <span>{{.AddedUnix.FormatShort}}</span></i>`
`28`	`28`	`-`
`29`		`- <i>{{if .ExpiredUnix}}{{$.i18n.Tr "settings.valid_until"}} <span>{{.ExpiredUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i>`
	`29`	`+ <i>{{if not .ExpiredUnix.IsZero}}{{$.i18n.Tr "settings.valid_until"}} <span>{{.ExpiredUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i>`
`30`	`30`	`</div>`
`31`	`31`	`</div>`
`32`	`32`	`</div>`