diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index 40a79d95781dd..f93419fe873eb 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -138,7 +138,7 @@ func NewFuncMap() []template.FuncMap {
"TimeSinceUnix": timeutil.TimeSinceUnix,
"Sec2Time": util.SecToTime,
"DateFmtLong": func(t time.Time) string {
- return t.Format(time.RFC1123Z)
+ return t.Format(time.RFC3339)
},
"LoadTimes": func(startTime time.Time) string {
return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"
diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index daa5e1541962a..bdde54c617540 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -6,11 +6,9 @@ package timeutil
import (
"fmt"
"html/template"
- "math"
"strings"
"time"
- "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/translation"
)
@@ -24,10 +22,6 @@ const (
Year = 12 * Month
)
-func round(s float64) int64 {
- return int64(math.Round(s))
-}
-
func computeTimeDiffFloor(diff int64, lang translation.Locale) (int64, string) {
diffStr := ""
switch {
@@ -86,94 +80,6 @@ func computeTimeDiffFloor(diff int64, lang translation.Locale) (int64, string) {
return diff, diffStr
}
-func computeTimeDiff(diff int64, lang translation.Locale) (int64, string) {
- diffStr := ""
- switch {
- case diff <= 0:
- diff = 0
- diffStr = lang.Tr("tool.now")
- case diff < 2:
- diff = 0
- diffStr = lang.Tr("tool.1s")
- case diff < 1*Minute:
- diffStr = lang.Tr("tool.seconds", diff)
- diff = 0
-
- case diff < Minute+Minute/2:
- diff -= 1 * Minute
- diffStr = lang.Tr("tool.1m")
- case diff < 1*Hour:
- minutes := round(float64(diff) / Minute)
- if minutes > 1 {
- diffStr = lang.Tr("tool.minutes", minutes)
- } else {
- diffStr = lang.Tr("tool.1m")
- }
- diff -= diff / Minute * Minute
-
- case diff < Hour+Hour/2:
- diff -= 1 * Hour
- diffStr = lang.Tr("tool.1h")
- case diff < 1*Day:
- hours := round(float64(diff) / Hour)
- if hours > 1 {
- diffStr = lang.Tr("tool.hours", hours)
- } else {
- diffStr = lang.Tr("tool.1h")
- }
- diff -= diff / Hour * Hour
-
- case diff < Day+Day/2:
- diff -= 1 * Day
- diffStr = lang.Tr("tool.1d")
- case diff < 1*Week:
- days := round(float64(diff) / Day)
- if days > 1 {
- diffStr = lang.Tr("tool.days", days)
- } else {
- diffStr = lang.Tr("tool.1d")
- }
- diff -= diff / Day * Day
-
- case diff < Week+Week/2:
- diff -= 1 * Week
- diffStr = lang.Tr("tool.1w")
- case diff < 1*Month:
- weeks := round(float64(diff) / Week)
- if weeks > 1 {
- diffStr = lang.Tr("tool.weeks", weeks)
- } else {
- diffStr = lang.Tr("tool.1w")
- }
- diff -= diff / Week * Week
-
- case diff < 1*Month+Month/2:
- diff -= 1 * Month
- diffStr = lang.Tr("tool.1mon")
- case diff < 1*Year:
- months := round(float64(diff) / Month)
- if months > 1 {
- diffStr = lang.Tr("tool.months", months)
- } else {
- diffStr = lang.Tr("tool.1mon")
- }
- diff -= diff / Month * Month
-
- case diff < Year+Year/2:
- diff -= 1 * Year
- diffStr = lang.Tr("tool.1y")
- default:
- years := round(float64(diff) / Year)
- if years > 1 {
- diffStr = lang.Tr("tool.years", years)
- } else {
- diffStr = lang.Tr("tool.1y")
- }
- diff -= (diff / Year) * Year
- }
- return diff, diffStr
-}
-
// MinutesToFriendly returns a user friendly string with number of minutes
// converted to hours and minutes.
func MinutesToFriendly(minutes int, lang translation.Locale) string {
@@ -208,43 +114,14 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
return strings.TrimPrefix(timeStr, ", ")
}
-func timeSince(then, now time.Time, lang translation.Locale) string {
- return timeSinceUnix(then.Unix(), now.Unix(), lang)
-}
-
-func timeSinceUnix(then, now int64, lang translation.Locale) string {
- lbl := "tool.ago"
- diff := now - then
- if then > now {
- lbl = "tool.from_now"
- diff = then - now
- }
- if diff <= 0 {
- return lang.Tr("tool.now")
- }
-
- _, diffStr := computeTimeDiff(diff, lang)
- return lang.Tr(lbl, diffStr)
-}
-
-// TimeSince calculates the time interval and generate user-friendly string.
+// TimeSince renders relative time HTML given a time.Time
func TimeSince(then time.Time, lang translation.Locale) template.HTML {
- return htmlTimeSince(then, time.Now(), lang)
+ timestamp := then.UTC().Format(time.RFC3339)
+ // declare data-tooltip-content attribute to switch from "title" tooltip to "tippy" tooltip
+ return template.HTML(fmt.Sprintf(`%s`, lang.Tr("on_date"), timestamp, timestamp))
}
-func htmlTimeSince(then, now time.Time, lang translation.Locale) template.HTML {
- return template.HTML(fmt.Sprintf(`%s`,
- then.In(setting.DefaultUILocation).Format(GetTimeFormat(lang.Language())),
- timeSince(then, now, lang)))
-}
-
-// TimeSinceUnix calculates the time interval and generate user-friendly string.
+// TimeSinceUnix renders relative time HTML given a TimeStamp
func TimeSinceUnix(then TimeStamp, lang translation.Locale) template.HTML {
- return htmlTimeSinceUnix(then, TimeStamp(time.Now().Unix()), lang)
-}
-
-func htmlTimeSinceUnix(then, now TimeStamp, lang translation.Locale) template.HTML {
- return template.HTML(fmt.Sprintf(`%s`,
- then.FormatInLocation(GetTimeFormat(lang.Language()), setting.DefaultUILocation),
- timeSinceUnix(int64(then), int64(now), lang)))
+ return TimeSince(then.AsLocalTime(), lang)
}
diff --git a/modules/timeutil/since_test.go b/modules/timeutil/since_test.go
index 9a037c7bd0812..40fefe8700950 100644
--- a/modules/timeutil/since_test.go
+++ b/modules/timeutil/since_test.go
@@ -5,7 +5,6 @@ package timeutil
import (
"context"
- "fmt"
"os"
"testing"
"time"
@@ -40,46 +39,6 @@ func TestMain(m *testing.M) {
os.Exit(retVal)
}
-func TestTimeSince(t *testing.T) {
- assert.Equal(t, "now", timeSince(BaseDate, BaseDate, translation.NewLocale("en-US")))
-
- // test that each diff in `diffs` yields the expected string
- test := func(expected string, diffs ...time.Duration) {
- t.Run(expected, func(t *testing.T) {
- for _, diff := range diffs {
- actual := timeSince(BaseDate, BaseDate.Add(diff), translation.NewLocale("en-US"))
- assert.Equal(t, translation.NewLocale("en-US").Tr("tool.ago", expected), actual)
- actual = timeSince(BaseDate.Add(diff), BaseDate, translation.NewLocale("en-US"))
- assert.Equal(t, translation.NewLocale("en-US").Tr("tool.from_now", expected), actual)
- }
- })
- }
- test("1 second", time.Second, time.Second+50*time.Millisecond)
- test("2 seconds", 2*time.Second, 2*time.Second+50*time.Millisecond)
- test("1 minute", time.Minute, time.Minute+29*time.Second)
- test("2 minutes", 2*time.Minute, time.Minute+30*time.Second)
- test("2 minutes", 2*time.Minute, 2*time.Minute+29*time.Second)
- test("1 hour", time.Hour, time.Hour+29*time.Minute)
- test("2 hours", 2*time.Hour, time.Hour+30*time.Minute)
- test("2 hours", 2*time.Hour, 2*time.Hour+29*time.Minute)
- test("3 hours", 3*time.Hour, 2*time.Hour+30*time.Minute)
- test("1 day", DayDur, DayDur+11*time.Hour)
- test("2 days", 2*DayDur, DayDur+12*time.Hour)
- test("2 days", 2*DayDur, 2*DayDur+11*time.Hour)
- test("3 days", 3*DayDur, 2*DayDur+12*time.Hour)
- test("1 week", WeekDur, WeekDur+3*DayDur)
- test("2 weeks", 2*WeekDur, WeekDur+4*DayDur)
- test("2 weeks", 2*WeekDur, 2*WeekDur+3*DayDur)
- test("3 weeks", 3*WeekDur, 2*WeekDur+4*DayDur)
- test("1 month", MonthDur, MonthDur+14*DayDur)
- test("2 months", 2*MonthDur, MonthDur+15*DayDur)
- test("2 months", 2*MonthDur, 2*MonthDur+14*DayDur)
- test("1 year", YearDur, YearDur+5*MonthDur)
- test("2 years", 2*YearDur, YearDur+6*MonthDur)
- test("2 years", 2*YearDur, 2*YearDur+5*MonthDur)
- test("3 years", 3*YearDur, 2*YearDur+6*MonthDur)
-}
-
func TestTimeSincePro(t *testing.T) {
assert.Equal(t, "now", timeSincePro(BaseDate, BaseDate, translation.NewLocale("en-US")))
@@ -113,60 +72,6 @@ func TestTimeSincePro(t *testing.T) {
12*time.Minute+17*time.Second)
}
-func TestHtmlTimeSince(t *testing.T) {
- setting.TimeFormat = time.UnixDate
- setting.DefaultUILocation = time.UTC
- // test that `diff` yields a result containing `expected`
- test := func(expected string, diff time.Duration) {
- actual := htmlTimeSince(BaseDate, BaseDate.Add(diff), translation.NewLocale("en-US"))
- assert.Contains(t, actual, `data-tooltip-content="Sat Jan 1 00:00:00 UTC 2000"`)
- assert.Contains(t, actual, expected)
- }
- test("1 second", time.Second)
- test("3 minutes", 3*time.Minute+5*time.Second)
- test("1 day", DayDur+11*time.Hour)
- test("1 week", WeekDur+3*DayDur)
- test("3 months", 3*MonthDur+2*WeekDur)
- test("2 years", 2*YearDur)
- test("3 years", 2*YearDur+11*MonthDur+4*WeekDur)
-}
-
-func TestComputeTimeDiff(t *testing.T) {
- // test that for each offset in offsets,
- // computeTimeDiff(base + offset) == (offset, str)
- test := func(base int64, str string, offsets ...int64) {
- for _, offset := range offsets {
- t.Run(fmt.Sprintf("%s:%d", str, offset), func(t *testing.T) {
- diff, diffStr := computeTimeDiff(base+offset, translation.NewLocale("en-US"))
- assert.Equal(t, offset, diff)
- assert.Equal(t, str, diffStr)
- })
- }
- }
- test(0, "now", 0)
- test(1, "1 second", 0)
- test(2, "2 seconds", 0)
- test(Minute, "1 minute", 0, 1, 29)
- test(Minute, "2 minutes", 30, Minute-1)
- test(2*Minute, "2 minutes", 0, 29)
- test(2*Minute, "3 minutes", 30, Minute-1)
- test(Hour, "1 hour", 0, 1, 29*Minute)
- test(Hour, "2 hours", 30*Minute, Hour-1)
- test(5*Hour, "5 hours", 0, 29*Minute)
- test(Day, "1 day", 0, 1, 11*Hour)
- test(Day, "2 days", 12*Hour, Day-1)
- test(5*Day, "5 days", 0, 11*Hour)
- test(Week, "1 week", 0, 1, 3*Day)
- test(Week, "2 weeks", 4*Day, Week-1)
- test(3*Week, "3 weeks", 0, 3*Day)
- test(Month, "1 month", 0, 1)
- test(Month, "2 months", 16*Day, Month-1)
- test(10*Month, "10 months", 0, 13*Day)
- test(Year, "1 year", 0, 179*Day)
- test(Year, "2 years", 180*Day, Year-1)
- test(3*Year, "3 years", 0, 179*Day)
-}
-
func TestMinutesToFriendly(t *testing.T) {
// test that a number of minutes yields the expected string
test := func(expected string, minutes int) {
diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go
index c8e0d4bdc114a..c60d287faee13 100644
--- a/modules/timeutil/timestamp.go
+++ b/modules/timeutil/timestamp.go
@@ -64,9 +64,8 @@ func (ts TimeStamp) AsLocalTime() time.Time {
}
// AsTimeInLocation convert timestamp as time.Time in Local locale
-func (ts TimeStamp) AsTimeInLocation(loc *time.Location) (tm time.Time) {
- tm = time.Unix(int64(ts), 0).In(loc)
- return tm
+func (ts TimeStamp) AsTimeInLocation(loc *time.Location) time.Time {
+ return time.Unix(int64(ts), 0).In(loc)
}
// AsTimePtr convert timestamp as *time.Time in Local locale
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index bd7e64fc6da5d..08b23e0387820 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -112,6 +112,8 @@ never = Never
rss_feed = RSS Feed
+on_date = on
+
[aria]
navbar = Navigation Bar
footer = Footer
@@ -3191,7 +3193,6 @@ details.documentation_site = Documentation Site
details.license = License
assets = Assets
versions = Versions
-versions.on = on
versions.view_all = View all
dependency.id = ID
dependency.version = Version
diff --git a/package-lock.json b/package-lock.json
index 3d565d7864ba2..e857bc137c190 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
"@citation-js/plugin-software-formats": "0.6.1",
"@claviska/jquery-minicolors": "2.3.6",
"@github/markdown-toolbar-element": "2.1.1",
+ "@github/relative-time-element": "4.2.4",
"@github/text-expander-element": "2.3.0",
"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
"@primer/octicons": "18.3.0",
@@ -851,6 +852,11 @@
"resolved": "https://registry.npmjs.org/@github/markdown-toolbar-element/-/markdown-toolbar-element-2.1.1.tgz",
"integrity": "sha512-J++rpd5H9baztabJQB82h26jtueOeBRSTqetk9Cri+Lj/s28ndu6Tovn0uHQaOKtBWDobFunk9b5pP5vcqt7cA=="
},
+ "node_modules/@github/relative-time-element": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-4.2.4.tgz",
+ "integrity": "sha512-18qgH9FYUHYN9K3z4s35auDHww1dKTU6TacI8JkA5OuvHVa1lTMuSTZ4hIoJngD5+mizcoRMOs6p/yZYMIjsyg=="
+ },
"node_modules/@github/text-expander-element": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/@github/text-expander-element/-/text-expander-element-2.3.0.tgz",
diff --git a/package.json b/package.json
index 829b9f4ad0e81..57dcfc2f7f54f 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"@citation-js/plugin-software-formats": "0.6.1",
"@claviska/jquery-minicolors": "2.3.6",
"@github/markdown-toolbar-element": "2.1.1",
+ "@github/relative-time-element": "4.2.4",
"@github/text-expander-element": "2.3.0",
"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
"@primer/octicons": "18.3.0",
diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go
index 0a51000c70c90..9847a6d9236f6 100644
--- a/routers/web/admin/admin.go
+++ b/routers/web/admin/admin.go
@@ -18,8 +18,6 @@ import (
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/queue"
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/timeutil"
- "code.gitea.io/gitea/modules/translation"
"code.gitea.io/gitea/modules/updatechecker"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/cron"
@@ -34,7 +32,7 @@ const (
)
var sysStatus struct {
- Uptime string
+ StartTime string
NumGoroutine int
// General statistics.
@@ -75,7 +73,7 @@ var sysStatus struct {
}
func updateSystemStatus() {
- sysStatus.Uptime = timeutil.TimeSincePro(setting.AppStartTime, translation.NewLocale("en-US"))
+ sysStatus.StartTime = setting.AppStartTime.Format(time.RFC3339)
m := new(runtime.MemStats)
runtime.ReadMemStats(m)
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index c431c79cb51e3..3b8d17ff7d23d 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -29,8 +29,8 @@
{{.Name}} |
{{.TypeName}} |
{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} |
- |
- |
+ {{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}} |
+ {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}} |
{{svg "octicon-pencil"}} |
{{end}}
diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl
index 29e4bc09bcaad..51685112baff0 100644
--- a/templates/admin/cron.tmpl
+++ b/templates/admin/cron.tmpl
@@ -21,8 +21,8 @@
|
{{$.locale.Tr (printf "admin.dashboard.%s" .Name)}} |
{{.Spec}} |
- {{DateFmtLong .Next}} |
- {{if gt .Prev.Year 1}}{{DateFmtLong .Prev}}{{else}}N/A{{end}} |
+ {{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Next) "Fallback" (DateFmtLong .Next) )}} |
+ {{if gt .Prev.Year 1}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Prev) "Fallback" (DateFmtLong .Prev) )}}{{else}}N/A{{end}} |
{{.ExecTimes}} |
{{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}} |
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index d2ba1e2b010db..fc1b1f43857e0 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -83,7 +83,7 @@
- {{.locale.Tr "admin.dashboard.server_uptime"}}
- - {{.SysStatus.Uptime}}
+ - {{.SysStatus.StartTime}}
- {{.locale.Tr "admin.dashboard.current_goroutine"}}
- {{.SysStatus.NumGoroutine}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index bfe4762350feb..dd17bde036ad3 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -29,7 +29,7 @@
{{.ID}} |
{{$.locale.Tr .TrStr}} |
{{.Description}} |
- |
+ {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}} |
{{svg "octicon-note" 16 "view-detail"}} |
{{end}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 9bf7a6268e5b7..f114b90fc7b5b 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -44,7 +44,7 @@
{{.NumTeams}} |
{{.NumMembers}} |
{{.NumRepos}} |
- |
+ {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}} |
{{svg "octicon-pencil"}} |
{{end}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index bb36ca1ae358e..121f575861d99 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -68,7 +68,7 @@
{{end}}
{{FileSize .CalculateBlobSize}} |
- |
+ {{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}} |
{{svg "octicon-trash"}} |
{{end}}
diff --git a/templates/admin/process-row.tmpl b/templates/admin/process-row.tmpl
index 477bf5a41ea1a..8fd2d1af700dc 100644
--- a/templates/admin/process-row.tmpl
+++ b/templates/admin/process-row.tmpl
@@ -3,7 +3,7 @@
{{if eq .Process.Type "request"}}{{svg "octicon-globe" 16}}{{else if eq .Process.Type "system"}}{{svg "octicon-cpu" 16}}{{else}}{{svg "octicon-terminal" 16}}{{end}}
-
{{TimeSince .Process.Start .root.locale}}
+
{{TimeSince .Process.Start .root.locale}}
{{if ne .Process.Type "system"}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 19dd70da12146..767c235a385e1 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -158,8 +158,8 @@
{{range .Queue.Workers}}
{{.Workers}}{{if .IsFlusher}}{{svg "octicon-sync"}}{{end}} |
- {{DateFmtLong .Start}} |
- {{if .HasTimeout}}{{DateFmtLong .Timeout}}{{else}}-{{end}} |
+ {{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Start) "Fallback" (DateFmtLong .Start) )}} |
+ {{if .HasTimeout}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Timeout) "Fallback" (DateFmtLong .Timeout) )}}{{else}}-{{end}} |
{{svg "octicon-trash"}}
|
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 11216b8c86399..f8e2bbc8444ef 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -83,7 +83,7 @@
{{.NumForks}} |
{{.NumIssues}} |
{{FileSize .Size}} |
- |
+ {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}} |
{{svg "octicon-trash"}} |
{{end}}
diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl
index e6d2e68cbb6fb..15e51e4aca7ce 100644
--- a/templates/admin/stacktrace-row.tmpl
+++ b/templates/admin/stacktrace-row.tmpl
@@ -13,7 +13,7 @@
-
{{if ne .Process.Type "none"}}{{TimeSince .Process.Start .root.locale}}{{end}}
+
{{if ne .Process.Type "none"}}{{TimeSince .Process.Start .root.locale}}{{end}}
{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 88af2172b7612..50b9d136190e3 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -94,9 +94,9 @@
{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} |
{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} |
{{.NumRepos}} |
-
|
+
{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}} |
{{if .LastLoginUnix}}
-
|
+
{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}} |
{{else}}
{{$.locale.Tr "admin.users.never_login"}} |
{{end}}
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index c763fcffc6f2a..fe9359251b7f1 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -23,7 +23,7 @@
{{svg "octicon-link"}}
{{.Website}}
{{end}}
- {{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}}
+ {{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index aa397e65b7ee2..5dbc4ef6e7463 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -18,7 +18,7 @@
{{svg "octicon-mail"}}
{{.Email}}
{{end}}
- {{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}}
+ {{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}
diff --git a/templates/package/shared/cleanup_rules/preview.tmpl b/templates/package/shared/cleanup_rules/preview.tmpl
index c59ad67f7749c..f9c9bc71f0843 100644
--- a/templates/package/shared/cleanup_rules/preview.tmpl
+++ b/templates/package/shared/cleanup_rules/preview.tmpl
@@ -22,7 +22,7 @@
{{.Version.Version}} |
{{.Creator.Name}} |
{{FileSize .CalculateBlobSize}} |
- |
+ {{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}} |
{{else}}
diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index beadcf5c1e8a3..9677b8eb09d9f 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -86,7 +86,7 @@
{{range .LatestVersions}}
{{.Version}}
-
{{$.locale.Tr "packages.versions.on"}} {{.CreatedUnix.FormatDate}}
+
{{$.locale.Tr "on_date"}} {{.CreatedUnix.FormatDate}}
{{end}}
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index ae1d426bc0741..aa71fe838b710 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -2,7 +2,7 @@
{{template "repo/header" .}}
-