From bca50104629bdf928dd7ae6573417ecbe8f07819 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 7 Mar 2024 21:53:25 +0100 Subject: [PATCH] Format dates in `` with user's current locale settings Fixes: https://github.com/go-gitea/gitea/issues/28371 --- modules/timeutil/datetime.go | 2 +- modules/timeutil/datetime_test.go | 10 +++++----- modules/timeutil/since.go | 2 +- templates/admin/system_status.tmpl | 4 ++-- web_src/js/components/DiffCommitSelector.vue | 2 +- web_src/js/components/RepoContributors.vue | 2 ++ 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/timeutil/datetime.go b/modules/timeutil/datetime.go index 62b94f7cf481..fe707ebeec75 100644 --- a/modules/timeutil/datetime.go +++ b/modules/timeutil/datetime.go @@ -51,7 +51,7 @@ func DateTime(format string, datetime any, extraAttrs ...string) template.HTML { attrs := make([]string, 0, 10+len(extraAttrs)) attrs = append(attrs, extraAttrs...) - attrs = append(attrs, `data-tooltip-content`, `data-tooltip-interactive="true"`) + attrs = append(attrs, `data-tooltip-content`, `data-tooltip-interactive="true"`, `lang="unknown"`) attrs = append(attrs, `format="datetime"`, `weekday=""`, `year="numeric"`) switch format { diff --git a/modules/timeutil/datetime_test.go b/modules/timeutil/datetime_test.go index 26494b84754f..83134c30230f 100644 --- a/modules/timeutil/datetime_test.go +++ b/modules/timeutil/datetime_test.go @@ -27,17 +27,17 @@ func TestDateTime(t *testing.T) { assert.EqualValues(t, "-", DateTime("short", TimeStamp(0))) actual := DateTime("short", "invalid") - assert.EqualValues(t, `invalid`, actual) + assert.EqualValues(t, `invalid`, actual) actual = DateTime("short", refTimeStr) - assert.EqualValues(t, `2018-01-01T00:00:00Z`, actual) + assert.EqualValues(t, `2018-01-01T00:00:00Z`, actual) actual = DateTime("short", refTime) - assert.EqualValues(t, `2018-01-01`, actual) + assert.EqualValues(t, `2018-01-01`, actual) actual = DateTime("short", refTimeStamp) - assert.EqualValues(t, `2017-12-31`, actual) + assert.EqualValues(t, `2017-12-31`, actual) actual = DateTime("full", refTimeStamp) - assert.EqualValues(t, `2017-12-31 19:00:00 -05:00`, actual) + assert.EqualValues(t, `2017-12-31 19:00:00 -05:00`, actual) } diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index dfaa0e3e3aa3..4d310d4be801 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -126,7 +126,7 @@ func timeSinceUnix(then, now time.Time, _ translation.Locale) template.HTML { } // declare data-tooltip-content attribute to switch from "title" tooltip to "tippy" tooltip - htm := fmt.Sprintf(`%s`, + htm := fmt.Sprintf(`%s`, attrs, then.Format(time.RFC3339), friendlyText) return template.HTML(htm) } diff --git a/templates/admin/system_status.tmpl b/templates/admin/system_status.tmpl index 7b5c9be6ccce..f67e9e76bb2c 100644 --- a/templates/admin/system_status.tmpl +++ b/templates/admin/system_status.tmpl @@ -1,6 +1,6 @@
{{ctx.Locale.Tr "admin.dashboard.server_uptime"}}
-
{{.SysStatus.StartTime}}
+
{{.SysStatus.StartTime}}
{{ctx.Locale.Tr "admin.dashboard.current_goroutine"}}
{{.SysStatus.NumGoroutine}}
@@ -52,7 +52,7 @@
{{ctx.Locale.Tr "admin.dashboard.next_gc_recycle"}}
{{.SysStatus.NextGC}}
{{ctx.Locale.Tr "admin.dashboard.last_gc_time"}}
-
{{.SysStatus.LastGCTime}}
+
{{.SysStatus.LastGCTime}}
{{ctx.Locale.Tr "admin.dashboard.total_gc_pause"}}
{{.SysStatus.PauseTotalNs}}
{{ctx.Locale.Tr "admin.dashboard.last_gc_pause"}}
diff --git a/web_src/js/components/DiffCommitSelector.vue b/web_src/js/components/DiffCommitSelector.vue index 54877a18c0fc..40400b4d0beb 100644 --- a/web_src/js/components/DiffCommitSelector.vue +++ b/web_src/js/components/DiffCommitSelector.vue @@ -248,7 +248,7 @@ export default { {{ commit.committer_or_author_name }} - {{ commit.time }} + {{ commit.time }} diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue index 22c247ae326e..89927b6a90b1 100644 --- a/web_src/js/components/RepoContributors.vue +++ b/web_src/js/components/RepoContributors.vue @@ -312,6 +312,7 @@ export default { month="short" day="numeric" weekday="" + lang="unknown" :datetime="new Date(xAxisMin)" > {{ new Date(xAxisMin) }} @@ -324,6 +325,7 @@ export default { month="short" day="numeric" weekday="" + lang="unknown" :datetime="new Date(xAxisMax)" > {{ new Date(xAxisMax) }}