From 506d1b31bc9982c0ca62a60738e134ae2a44d275 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Fri, 7 Apr 2023 21:00:06 +0000
Subject: [PATCH 01/35] Use auto-updating, natively hoverable, localized time
 elements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Added GitHub’s `relative-time` element
- Converted all formatted timestamps to use this element
- No more flashes of unstyled content around time elements
- These elements have native tooltips that show the full timestamp and are localized using the HTML’s `lang` property
- Relative (e.g. the activities in the dashboard) and duration (e.g. server uptime in the admin page) time elements are auto-updated to keep up with the current time without refreshing the page
- Deleted code that is not needed anymore, such as `formatting.js` and simplified `since.go`

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
---
 modules/timeutil/since.go                     | 134 +-----------------
 modules/timeutil/since_test.go                |  95 -------------
 package-lock.json                             |   6 +
 package.json                                  |   1 +
 routers/web/admin/admin.go                    |   6 +-
 routers/web/repo/blame.go                     |   2 +-
 routers/web/repo/issue_content_history.go     |   2 +-
 templates/admin/auth/list.tmpl                |   4 +-
 templates/admin/dashboard.tmpl                |   2 +-
 templates/admin/notice.tmpl                   |   2 +-
 templates/admin/org/list.tmpl                 |   2 +-
 templates/admin/packages/list.tmpl            |   2 +-
 templates/admin/process-row.tmpl              |   2 +-
 templates/admin/repo/list.tmpl                |   2 +-
 templates/admin/stacktrace-row.tmpl           |   2 +-
 templates/admin/user/list.tmpl                |   4 +-
 templates/explore/organizations.tmpl          |   2 +-
 templates/explore/repo_list.tmpl              |   2 +-
 templates/explore/users.tmpl                  |   2 +-
 .../package/shared/cleanup_rules/preview.tmpl |   2 +-
 templates/package/shared/list.tmpl            |   2 +-
 templates/package/shared/versionlist.tmpl     |   2 +-
 templates/package/view.tmpl                   |   4 +-
 templates/projects/list.tmpl                  |   2 +-
 templates/projects/view.tmpl                  |   2 +-
 templates/repo/actions/runs_list.tmpl         |   2 +-
 templates/repo/activity.tmpl                  |  14 +-
 templates/repo/branch/list.tmpl               |   6 +-
 templates/repo/commit_page.tmpl               |   4 +-
 templates/repo/commits_list.tmpl              |   4 +-
 templates/repo/diff/comments.tmpl             |   2 +-
 templates/repo/issue/milestone_issues.tmpl    |   2 +-
 templates/repo/issue/milestones.tmpl          |   2 +-
 templates/repo/issue/view_content.tmpl        |   2 +-
 .../repo/issue/view_content/comments.tmpl     |   6 +-
 templates/repo/issue/view_content/pull.tmpl   |   6 +-
 .../repo/issue/view_content/sidebar.tmpl      |   2 +-
 templates/repo/issue/view_title.tmpl          |   4 +-
 templates/repo/projects/list.tmpl             |   2 +-
 templates/repo/projects/view.tmpl             |   2 +-
 templates/repo/release/list.tmpl              |   6 +-
 templates/repo/settings/deploy_keys.tmpl      |   2 +-
 templates/repo/settings/lfs.tmpl              |   2 +-
 templates/repo/settings/lfs_file_find.tmpl    |   2 +-
 templates/repo/settings/lfs_locks.tmpl        |   2 +-
 templates/repo/settings/options.tmpl          |   4 +-
 templates/repo/user_cards.tmpl                |   2 +-
 templates/repo/view_list.tmpl                 |   4 +-
 templates/repo/wiki/pages.tmpl                |   2 +-
 templates/repo/wiki/revision.tmpl             |   2 +-
 templates/repo/wiki/view.tmpl                 |   2 +-
 templates/shared/actions/runner_edit.tmpl     |   4 +-
 templates/shared/actions/runner_list.tmpl     |   2 +-
 templates/shared/issuelist.tmpl               |   4 +-
 templates/shared/searchbottom.tmpl            |   2 +-
 templates/user/dashboard/feeds.tmpl           |   2 +-
 templates/user/dashboard/milestones.tmpl      |   2 +-
 templates/user/profile.tmpl                   |   2 +-
 templates/user/settings/applications.tmpl     |   2 +-
 templates/user/settings/grants_oauth2.tmpl    |   2 +-
 templates/user/settings/keys_gpg.tmpl         |   4 +-
 templates/user/settings/keys_principal.tmpl   |   2 +-
 templates/user/settings/keys_ssh.tmpl         |   2 +-
 .../user/settings/security/webauthn.tmpl      |   2 +-
 tests/integration/repo_test.go                |   5 +-
 web_src/js/features/formatting.js             |  31 ----
 web_src/js/index.js                           |   5 -
 web_src/js/webcomponents/README.md            |   6 -
 web_src/js/webcomponents/webcomponents.js     |   1 +
 69 files changed, 103 insertions(+), 355 deletions(-)
 delete mode 100644 web_src/js/features/formatting.js

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index daa5e1541962a..b7f9a60e13ff3 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,13 @@ 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.
-func TimeSince(then time.Time, lang translation.Locale) template.HTML {
-	return htmlTimeSince(then, time.Now(), lang)
-}
-
-func htmlTimeSince(then, now time.Time, lang translation.Locale) template.HTML {
-	return template.HTML(fmt.Sprintf(`<span class="time-since" data-tooltip-content="%s" data-tooltip-interactive="true">%s</span>`,
-		then.In(setting.DefaultUILocation).Format(GetTimeFormat(lang.Language())),
-		timeSince(then, now, lang)))
+func TimeSince(then time.Time) template.HTML {
+	timestamp := then.Format(time.RFC1123)
+	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" datetime="%s">%s</relative-time>`, timestamp, timestamp))
 }
 
 // TimeSinceUnix calculates the time interval and generate user-friendly string.
-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(`<span class="time-since" data-tooltip-content="%s" data-tooltip-interactive="true">%s</span>`,
-		then.FormatInLocation(GetTimeFormat(lang.Language()), setting.DefaultUILocation),
-		timeSinceUnix(int64(then), int64(now), lang)))
+func TimeSinceUnix(then TimeStamp) template.HTML {
+	return TimeSince(then.AsTime())
 }
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/package-lock.json b/package-lock.json
index b9d998a69d2a8..484e3f5701cb3 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",
         "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
         "@primer/octicons": "18.3.0",
         "@vue/compiler-sfc": "3.2.47",
@@ -844,6 +845,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/@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
diff --git a/package.json b/package.json
index 3ccf0c0840baa..ba5a654288103 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",
     "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
     "@primer/octicons": "18.3.0",
     "@vue/compiler-sfc": "3.2.47",
diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go
index 0a51000c70c90..cc18059611a8d 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.RFC1123)
 
 	m := new(runtime.MemStats)
 	runtime.ReadMemStats(m)
diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go
index 3546334ed6479..b470543894243 100644
--- a/routers/web/repo/blame.go
+++ b/routers/web/repo/blame.go
@@ -258,7 +258,7 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m
 				commitCnt++
 
 				// User avatar image
-				commitSince := timeutil.TimeSinceUnix(timeutil.TimeStamp(commit.Author.When.Unix()), ctx.Locale)
+				commitSince := timeutil.TimeSinceUnix(timeutil.TimeStamp(commit.Author.When.Unix()))
 
 				var avatar string
 				if commit.User != nil {
diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go
index 7e5295e757b7c..95b3dc2d84779 100644
--- a/routers/web/repo/issue_content_history.go
+++ b/routers/web/repo/issue_content_history.go
@@ -74,7 +74,7 @@ func GetContentHistoryList(ctx *context.Context) {
 		class := avatars.DefaultAvatarClass + " gt-mr-3"
 		name := html.EscapeString(username)
 		avatarHTML := string(templates.AvatarHTML(src, 28, class, username))
-		timeSinceText := string(timeutil.TimeSinceUnix(item.EditedUnix, ctx.Locale))
+		timeSinceText := string(timeutil.TimeSinceUnix(item.EditedUnix))
 
 		results = append(results, map[string]interface{}{
 			"name":  avatarHTML + "<strong>" + name + "</strong> " + actionText + " " + timeSinceText,
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index c431c79cb51e3..a7c5c19cd4ce9 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -29,8 +29,8 @@
 							<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
 							<td>{{.TypeName}}</td>
 							<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td><span data-tooltip-content="{{.UpdatedUnix.FormatShort}}"><time data-format="short-date" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</time></span></td>
-							<td><span data-tooltip-content="{{.CreatedUnix.FormatLong}}"><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span></td>
+							<td><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></td>
+							<td><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></td>
 							<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
 						</tr>
 					{{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 @@
 		<div class="ui attached table segment">
 			<dl class="dl-horizontal admin-dl-horizontal">
 				<dt>{{.locale.Tr "admin.dashboard.server_uptime"}}</dt>
-				<dd>{{.SysStatus.Uptime}}</dd>
+				<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
 				<dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt>
 				<dd>{{.SysStatus.NumGoroutine}}</dd>
 				<div class="ui divider"></div>
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index bfe4762350feb..e3180fa04fce1 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -29,7 +29,7 @@
 							<td>{{.ID}}</td>
 							<td>{{$.locale.Tr .TrStr}}</td>
 							<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
-							<td><span class="notice-created-time" data-tooltip-content="{{.CreatedUnix.AsTime}}"><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span></td>
+							<td><span class="notice-created-time"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span></td>
 							<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 9bf7a6268e5b7..e1aaeef5cf1a7 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -44,7 +44,7 @@
 							<td>{{.NumTeams}}</td>
 							<td>{{.NumMembers}}</td>
 							<td>{{.NumRepos}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}"><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span></td>
+							<td><span title="{{.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span></td>
 							<td><a href="{{.OrganisationLink}}/settings">{{svg "octicon-pencil"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index bb36ca1ae358e..edfcfe39cca82 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -68,7 +68,7 @@
 							{{end}}
 							</td>
 							<td>{{FileSize .CalculateBlobSize}}</td>
-							<td><span title="{{.Version.CreatedUnix.FormatLong}}"><time data-format="short-date" datetime="{{.Version.CreatedUnix.FormatLong}}">{{.Version.CreatedUnix.FormatShort}}</time></span></td>
+							<td><span title="{{.Version.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.Version.CreatedUnix.FormatLong}}">{{.Version.CreatedUnix.FormatShort}}</relative-time></span></td>
 							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/process-row.tmpl b/templates/admin/process-row.tmpl
index 477bf5a41ea1a..81d45897b17b0 100644
--- a/templates/admin/process-row.tmpl
+++ b/templates/admin/process-row.tmpl
@@ -3,7 +3,7 @@
 		<div class="icon gt-ml-3 gt-mr-3">{{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}}</div>
 		<div class="content gt-f1">
 			<div class="header">{{.Process.Description}}</div>
-			<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span></div>
+			<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start}}</span></div>
 		</div>
 		<div>
 			{{if ne .Process.Type "system"}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 11216b8c86399..3f6c0c48e67b8 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -83,7 +83,7 @@
 							<td>{{.NumForks}}</td>
 							<td>{{.NumIssues}}</td>
 							<td>{{FileSize .Size}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}"><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span></td>
+							<td><span title="{{.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span></td>
 							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl
index e6d2e68cbb6fb..b3abe52216df0 100644
--- a/templates/admin/stacktrace-row.tmpl
+++ b/templates/admin/stacktrace-row.tmpl
@@ -13,7 +13,7 @@
 		</div>
 		<div class="content gt-f1">
 			<div class="header">{{.Process.Description}}</div>
-			<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span>{{end}}</div>
+			<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start}}</span>{{end}}</div>
 		</div>
 		<div>
 			{{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..974913962cecc 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -94,9 +94,9 @@
 							<td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{.NumRepos}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}"><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span></td>
+							<td><span title="{{.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span></td>
 							{{if .LastLoginUnix}}
-								<td><span title="{{.LastLoginUnix.FormatLong}}"><time data-format="short-date" datetime="{{.LastLoginUnix.FormatLong}}">{{.LastLoginUnix.FormatShort}}</time></span></td>
+								<td><span title="{{.LastLoginUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.LastLoginUnix.FormatLong}}">{{.LastLoginUnix.FormatShort}}</relative-time></span></td>
 							{{else}}
 								<td><span>{{$.locale.Tr "admin.users.never_login"}}</span></td>
 							{{end}}
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index c763fcffc6f2a..9357589da69a3 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -23,7 +23,7 @@
 								{{svg "octicon-link"}}
 								<a href="{{.Website}}" rel="nofollow">{{.Website}}</a>
 							{{end}}
-							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time>
+							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time>
 						</div>
 					</div>
 				</div>
diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index b311472b43ed2..8e9737a699f26 100644
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -60,7 +60,7 @@
 					{{end}}
 					</div>
 				{{end}}
-				<p class="time">{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.locale}}</p>
+				<p class="time">{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix}}</p>
 			</div>
 		</div>
 	{{else}}
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index aa397e65b7ee2..1f8430aeb0fe4 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -18,7 +18,7 @@
 								{{svg "octicon-mail"}}
 								<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
 							{{end}}
-							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time>
+							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time>
 						</div>
 					</div>
 				</div>
diff --git a/templates/package/shared/cleanup_rules/preview.tmpl b/templates/package/shared/cleanup_rules/preview.tmpl
index c59ad67f7749c..1101d57072220 100644
--- a/templates/package/shared/cleanup_rules/preview.tmpl
+++ b/templates/package/shared/cleanup_rules/preview.tmpl
@@ -22,7 +22,7 @@
 					<td><a href="{{.FullWebLink}}">{{.Version.Version}}</a></td>
 					<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
 					<td>{{FileSize .CalculateBlobSize}}</td>
-					<td><span title="{{.Version.CreatedUnix.FormatLong}}"><time data-format="short-date" datetime="{{.Version.CreatedUnix.FormatLong}}">{{.Version.CreatedUnix.FormatShort}}</time></span></td>
+					<td><span title="{{.Version.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.Version.CreatedUnix.FormatLong}}">{{.Version.CreatedUnix.FormatShort}}</relative-time></span></td>
 				</tr>
 			{{else}}
 				<tr>
diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl
index 2b6398fcd6705..864ffd382fcf4 100644
--- a/templates/package/shared/list.tmpl
+++ b/templates/package/shared/list.tmpl
@@ -22,7 +22,7 @@
 						<span class="ui label">{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}</span>
 					</div>
 					<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
-						{{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}}
+						{{$timeStr := TimeSinceUnix .Version.CreatedUnix}}
 						{{$hasRepositoryAccess := false}}
 						{{if .Repository}}
 							{{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}}
diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl
index ba488586a82e6..c1c612f480e4c 100644
--- a/templates/package/shared/versionlist.tmpl
+++ b/templates/package/shared/versionlist.tmpl
@@ -27,7 +27,7 @@
 						<a class="title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a>
 					</div>
 					<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
-						{{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
+						{{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
 					</div>
 				</div>
 			</li>
diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index beadcf5c1e8a3..ea9cae3bcee2a 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -9,7 +9,7 @@
 						<h1>{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})</h1>
 					</div>
 					<div>
-						{{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}}
+						{{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix}}
 						{{if .HasRepositoryAccess}}
 							{{.locale.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink (.PackageDescriptor.Creator.GetDisplayName | Escape) .PackageDescriptor.Repository.Link (.PackageDescriptor.Repository.FullName | Escape) | Safe}}
 						{{else}}
@@ -44,7 +44,7 @@
 							{{if .HasRepositoryAccess}}
 							<div class="item">{{svg "octicon-repo" 16 "gt-mr-3"}} <a href="{{.PackageDescriptor.Repository.Link}}">{{.PackageDescriptor.Repository.FullName}}</a></div>
 							{{end}}
-							<div class="item">{{svg "octicon-calendar" 16 "gt-mr-3"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}}</div>
+							<div class="item">{{svg "octicon-calendar" 16 "gt-mr-3"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix}}</div>
 							<div class="item">{{svg "octicon-download" 16 "gt-mr-3"}} {{.PackageDescriptor.Version.DownloadCount}}</div>
 							{{template "package/metadata/cargo" .}}
 							{{template "package/metadata/chef" .}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index 73ae5ab6e4076..a15a9682a7780 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -40,7 +40,7 @@
 				<li class="item">
 					{{svg .IconName}} <a href="{{.Link}}">{{.Title}}</a>
 					<div class="meta">
-						{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
+						{{$closedDate:= TimeSinceUnix .ClosedDateUnix}}
 						{{if .IsClosed}}
 							{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 						{{end}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 20c95c82789a6..58cadd44e6163 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -203,7 +203,7 @@
 							<div class="meta gt-my-2">
 								<span class="text light grey">
 									{{.Repo.FullName}}#{{.Index}}
-									{{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
+									{{$timeStr := TimeSinceUnix .GetLastEventTimestamp}}
 									{{if .OriginalAuthor}}
 										{{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
 									{{else if gt .Poster.ID 0}}
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index a28b9d71378b5..357401114b311 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -23,7 +23,7 @@
 				</div>
 			</div>
 			<div class="issue-item-right">
-				<div>{{TimeSinceUnix .Updated $.locale}}</div>
+				<div>{{TimeSinceUnix .Updated}}</div>
 				<div>{{.Duration}}</div>
 			</div>
 		</li>
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index ae1d426bc0741..3f71951d88bfe 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -2,7 +2,7 @@
 <div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
-		<h2 class="ui header"><time data-format="date" datetime="{{.DateFrom}}">{{.DateFrom}}</time> - <time data-format="date" datetime="{{.DateUntil}}">{{.DateUntil}}</time>
+		<h2 class="ui header"><relative-time format="datetime" year="numeric" month="long" day="numeric" weekday="" datetime="{{.DateFrom}}">{{.DateFrom}}</relative-time> - <relative-time format="datetime" year="numeric" month="long" day="numeric" weekday="" datetime="{{.DateUntil}}">{{.DateUntil}}</relative-time>
 			<div class="ui right">
 				<!-- Period -->
 				<div class="ui floating dropdown jump filter">
@@ -131,7 +131,7 @@
 						{{if not .IsTag}}
 							<a class="title" href="{{$.RepoLink}}/src/{{.TagName | PathEscapeSegments}}">{{.Title | RenderEmoji $.Context}}</a>
 						{{end}}
-						{{TimeSinceUnix .CreatedUnix $.locale}}
+						{{TimeSinceUnix .CreatedUnix}}
 					</p>
 				{{end}}
 			</div>
@@ -150,7 +150,7 @@
 					<p class="desc">
 						<span class="ui purple label">{{$.locale.Tr "repo.activity.merged_prs_label"}}</span>
 						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .MergedUnix $.locale}}
+						{{TimeSinceUnix .MergedUnix}}
 					</p>
 				{{end}}
 			</div>
@@ -169,7 +169,7 @@
 					<p class="desc">
 						<span class="ui green label">{{$.locale.Tr "repo.activity.opened_prs_label"}}</span>
 						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .Issue.CreatedUnix $.locale}}
+						{{TimeSinceUnix .Issue.CreatedUnix}}
 					</p>
 				{{end}}
 			</div>
@@ -188,7 +188,7 @@
 					<p class="desc">
 						<span class="ui red label">{{$.locale.Tr "repo.activity.closed_issue_label"}}</span>
 						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .ClosedUnix $.locale}}
+						{{TimeSinceUnix .ClosedUnix}}
 					</p>
 				{{end}}
 			</div>
@@ -207,7 +207,7 @@
 					<p class="desc">
 						<span class="ui green label">{{$.locale.Tr "repo.activity.new_issue_label"}}</span>
 						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .CreatedUnix $.locale}}
+						{{TimeSinceUnix .CreatedUnix}}
 					</p>
 				{{end}}
 			</div>
@@ -231,7 +231,7 @@
 						{{else}}
 						<a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
 						{{end}}
-						{{TimeSinceUnix .UpdatedUnix $.locale}}
+						{{TimeSinceUnix .UpdatedUnix}}
 					</p>
 				{{end}}
 			</div>
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 6dd6aecb37f6f..196912159cd82 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -18,7 +18,7 @@
 									{{svg "octicon-shield-lock"}}
 								{{end}}
 								<a href="{{.RepoLink}}/src/branch/{{PathEscapeSegments .DefaultBranch}}">{{.DefaultBranch}}</a>
-								<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.Commit.ID.String}}">{{ShortSha .DefaultBranchBranch.Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}}</span> · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.Commit.Committer.When .locale}}</p>
+								<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.Commit.ID.String}}">{{ShortSha .DefaultBranchBranch.Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}}</span> · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.Commit.Committer.When}}</p>
 							</td>
 							<td class="right aligned overflow-visible">
 								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
@@ -55,13 +55,13 @@
 									<td class="six wide">
 									{{if .IsDeleted}}
 										<s><a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments .Name}}">{{.Name}}</a></s>
-										<p class="info">{{$.locale.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.locale}}</p>
+										<p class="info">{{$.locale.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix}}</p>
 									{{else}}
 										{{if .IsProtected}}
 											{{svg "octicon-shield-lock"}}
 										{{end}}
 										<a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments .Name}}">{{.Name}}</a>
-										<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.locale.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.locale}}</p>
+										<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.locale.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When}}</p>
 									{{end}}
 									</td>
 									<td class="three wide ui">
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 8d72cd1420246..6167bbcb89d55 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -156,7 +156,7 @@
 						{{avatarByEmail $.Context .Commit.Author.Email .Commit.Author.Email 28 "gt-mr-3"}}
 						<strong>{{.Commit.Author.Name}}</strong>
 					{{end}}
-					<span class="text grey gt-ml-3" id="authored-time">{{TimeSince .Commit.Author.When $.locale}}</span>
+					<span class="text grey gt-ml-3" id="authored-time">{{TimeSince .Commit.Author.When}}</span>
 					{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
 						<span class="text grey gt-mx-3">{{.locale.Tr "repo.diff.committed_by"}}</span>
 						{{if ne .Verification.CommittingUser.ID 0}}
@@ -277,7 +277,7 @@
 				{{else}}
 					<strong>{{.NoteCommit.Author.Name}}</strong>
 				{{end}}
-				<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.locale}}</span>
+				<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When}}</span>
 			</div>
 			<div class="ui bottom attached info segment git-notes">
 				<pre class="commit-body">{{RenderNote $.Context .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index 36333c554079c..94a9c8e0dcea8 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -76,9 +76,9 @@
 							{{end}}
 						</td>
 						{{if .Committer}}
-							<td class="text right aligned">{{TimeSince .Committer.When $.locale}}</td>
+							<td class="text right aligned">{{TimeSince .Committer.When}}</td>
 						{{else}}
-							<td class="text right aligned">{{TimeSince .Author.When $.locale}}</td>
+							<td class="text right aligned">{{TimeSince .Author.When}}</td>
 						{{end}}
 					</tr>
 				{{end}}
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 5c26e7815ff14..748ac2fab4984 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -1,6 +1,6 @@
 {{range .comments}}
 
-{{$createdStr:= TimeSinceUnix .CreatedUnix $.root.locale}}
+{{$createdStr:= TimeSinceUnix .CreatedUnix}}
 <div class="comment" id="{{.HashTag}}">
 	{{if .OriginalAuthor}}
 		<span class="avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index 123845de68fa3..a4d019d622fb0 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -29,7 +29,7 @@
 		</div>
 		<div class="ui one column stackable grid">
 			<div class="column">
-				{{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}}
+				{{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix}}
 				{{if .IsClosed}}
 					{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 				{{else}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 0336d35c17872..6b37d64e65c63 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -71,7 +71,7 @@
 						</div>
 					</div>
 					<div class="meta">
-						{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
+						{{$closedDate:= TimeSinceUnix .ClosedDateUnix}}
 						{{if .IsClosed}}
 							{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 						{{else}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 7c94d00fe4116..e8c98859c7d93 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -15,7 +15,7 @@
 	<input type="hidden" id="issueIndex" value="{{.Issue.Index}}">
 	<input type="hidden" id="type" value="{{.IssueType}}">
 
-	{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
+	{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix}}
 	<div class="twelve wide column comment-list prevent-before-timeline">
 		<div class="ui timeline">
 			<div id="{{.Issue.HashTag}}" class="timeline-item comment first">
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 52b453d0dd00c..1b7346b451694 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -1,7 +1,7 @@
 {{template "base/alert"}}
 {{range .Issue.Comments}}
 	{{if call $.ShouldShowCommentType .Type}}
-		{{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
+		{{$createdStr:= TimeSinceUnix .CreatedUnix}}
 
 		<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
 		5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING,
@@ -144,7 +144,7 @@
 			{{else if eq .RefAction 2}}
 				{{$refTr = "repo.issues.ref_reopening_from"}}
 			{{end}}
-			{{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
+			{{$createdStr:= TimeSinceUnix .CreatedUnix}}
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-bookmark"}}</span>
 				{{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}}
@@ -522,7 +522,7 @@
 									<div id="code-comments-{{(index $comms 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} gt-hidden{{end}}">
 										<div class="ui comments gt-mb-0">
 											{{range $comms}}
-												{{$createdSubStr:= TimeSinceUnix .CreatedUnix $.locale}}
+												{{$createdSubStr:= TimeSinceUnix .CreatedUnix}}
 												<div class="comment code-comment gt-pb-4" id="{{.HashTag}}">
 													<div class="content">
 														<div class="header comment-header">
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 8b758b2ac09a4..5e49e9e0ef0cd 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -4,7 +4,7 @@
 			<div class="ui segment">
 				<h4>{{$.locale.Tr "repo.issues.review.reviewers"}}</h4>
 				{{range .PullReviewers}}
-					{{$createdStr:= TimeSinceUnix .Review.UpdatedUnix $.locale}}
+					{{$createdStr:= TimeSinceUnix .Review.UpdatedUnix}}
 					<div class="ui divider"></div>
 					<div class="review-item">
 						<div class="review-item-left">
@@ -82,7 +82,7 @@
 					</div>
 				{{end}}
 				{{range .OriginalReviews}}
-					{{$createdStr:= TimeSinceUnix .UpdatedUnix $.locale}}
+					{{$createdStr:= TimeSinceUnix .UpdatedUnix}}
 					<div class="ui divider"></div>
 					<div class="review-item">
 						<div class="review-item-left">
@@ -301,7 +301,7 @@
 					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash}}
 						{{$hasPendingPullRequestMergeTip := ""}}
 						{{if .HasPendingPullRequestMerge}}
-							{{$createdPRMergeStr := TimeSinceUnix .PendingPullRequestMerge.CreatedUnix $.locale}}
+							{{$createdPRMergeStr := TimeSinceUnix .PendingPullRequestMerge.CreatedUnix}}
 							{{$hasPendingPullRequestMergeTip = $.locale.Tr "repo.pulls.auto_merge_has_pending_schedule" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr}}
 						{{end}}
 						<div class="ui divider"></div>
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 521d6ba1d3da8..2741924a28cb0 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -385,7 +385,7 @@
 					<div class="gt-df gt-sb gt-ac">
 						<div class="due-date {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-tooltip-content="{{.locale.Tr "repo.issues.due_date_overdue"}}"{{end}}>
 							{{svg "octicon-calendar" 16 "gt-mr-3"}}
-							<time data-format="date" datetime="{{.Issue.DeadlineUnix.FormatDate}}">{{.Issue.DeadlineUnix.FormatDate}}</time>
+							<relative-time format="datetime" year="numeric" month="long" day="numeric" weekday="" datetime="{{.Issue.DeadlineUnix.FormatDate}}">{{.Issue.DeadlineUnix.FormatDate}}</relative-time>
 						</div>
 						<div>
 							{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
index cf12daee04ddb..c8f4de805927d 100644
--- a/templates/repo/issue/view_title.tmpl
+++ b/templates/repo/issue/view_title.tmpl
@@ -42,7 +42,7 @@
 			{{$baseHref = printf "<a href=\"%s\">%s</a>" (.BaseBranchLink | Escape) $baseHref}}
 		{{end}}
 		{{if .Issue.PullRequest.HasMerged}}
-			{{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.locale}}
+			{{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix}}
 			{{if .Issue.OriginalAuthor}}
 				{{.Issue.OriginalAuthor}}
 				<span class="pull-desc">{{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}}</span>
@@ -90,7 +90,7 @@
 			</span>
 		{{end}}
 	{{else}}
-		{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
+		{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix}}
 		<span class="time-desc">
 			{{if .Issue.OriginalAuthor}}
 				{{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.OriginalAuthor|Escape) | Safe}}
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 227a2727055c7..982194c690650 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -42,7 +42,7 @@
 				<li class="item">
 					{{svg .IconName}} <a href="{{.Link}}">{{.Title}}</a>
 					<div class="meta">
-						{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
+						{{$closedDate:= TimeSinceUnix .ClosedDateUnix}}
 						{{if .IsClosed}}
 							{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 						{{end}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index acbd0241d4a58..d485409d7f187 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -214,7 +214,7 @@
 							<div class="meta gt-my-2">
 								<span class="text light grey">
 									#{{.Index}}
-									{{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
+									{{$timeStr := TimeSinceUnix .GetLastEventTimestamp}}
 									{{if .OriginalAuthor}}
 										{{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
 									{{else if gt .Poster.ID 0}}
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 12aaa0bd71723..666e121f0d903 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -40,7 +40,7 @@
 								<div class="download gt-df gt-ac">
 									{{if $.Permission.CanRead $.UnitTypeCode}}
 										{{if .CreatedUnix}}
-											<span class="gt-mr-3">{{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix $.locale}}</span>
+											<span class="gt-mr-3">{{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix}}</span>
 										{{end}}
 										<a class="gt-mr-3 gt-mono muted" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
 										{{if not $.DisableDownloadSourceArchives}}
@@ -111,7 +111,7 @@
 									{{$.locale.Tr "repo.tagged_this"}}
 								</span>
 								{{if .CreatedUnix}}
-									<span class="time">{{TimeSinceUnix .CreatedUnix $.locale}}</span>
+									<span class="time">{{TimeSinceUnix .CreatedUnix}}</span>
 								{{end}}
 								|
 								{{end}}
@@ -133,7 +133,7 @@
 									{{$.locale.Tr "repo.released_this"}}
 								</span>
 								{{if .CreatedUnix}}
-									<span class="time">{{TimeSinceUnix .CreatedUnix $.locale}}</span>
+									<span class="time">{{TimeSinceUnix .CreatedUnix}}</span>
 								{{end}}
 								{{if not .IsDraft}}
 									| <span class="ahead"><a href="{{$.RepoLink}}/compare/{{.TagName | PathEscapeSegments}}...{{.Target | PathEscapeSegments}}">{{$.locale.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}}</a> {{$.locale.Tr "repo.release.ahead.target" .Target}}</span>
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 952d1b8418164..d712ad740b31c 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -64,7 +64,7 @@
 									{{.Fingerprint}}
 								</div>
 								<div class="activity meta">
-									<i>{{$.locale.Tr "settings.add_on"}} <span><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><time data-format="short-date" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
+									<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
 								</div>
 							</div>
 						</div>
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 8be28ad9edba9..f5908bf9926f4 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -23,7 +23,7 @@
 							</span>
 						</td>
 						<td>{{FileSize .Size}}</td>
-						<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
+						<td>{{TimeSince .CreatedUnix.AsTime}}</td>
 						<td class="right aligned">
 							<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
 							<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index 81cb6498374a4..6e61501241332 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -37,7 +37,7 @@
 								{{$.locale.Tr "repo.diff.commit"}}
 								<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
 							</td>
-							<td>{{TimeSince .When $.locale}}</td>
+							<td>{{TimeSince .When}}</td>
 						</tr>
 					{{else}}
 						<tr>
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index cfe4f6add540a..960ddeb7cdbd0 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -39,7 +39,7 @@
 									{{$.Owner.DisplayName}}
 								</a>
 							</td>
-							<td>{{TimeSince .Created $.locale}}</td>
+							<td>{{TimeSince .Created}}</td>
 							<td class="right aligned">
 								<form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST">
 									{{$.CsrfTokenHtml}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 023be5cee4216..c0ffbcd004b3a 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -93,7 +93,7 @@
 						<tr>
 							<td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false).Address}}</td>
 							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
-							<td><time data-format="date-time" datetime="{{.Mirror.UpdatedUnix.FormatLong}}">{{.Mirror.UpdatedUnix.AsTime}}</time></td>
+							<td><relative-time format="datetime" weekday="" year="numeric" month="short" day="numeric" hour="numeric" minute="numeric", second="numeric" datetime="{{.Mirror.UpdatedUnix.FormatLong}}">{{.Mirror.UpdatedUnix.AsTime}}</relative-time></td>
 							<td class="right aligned">
 								<form method="post" style="display: inline-block">
 									{{.CsrfTokenHtml}}
@@ -171,7 +171,7 @@
 							{{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
 							<td>{{$address.Address}}</td>
 							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
-							<td>{{if .LastUpdateUnix}}<time data-format="date-time" datetime="{{.LastUpdateUnix.FormatLong}}">{{.LastUpdateUnix.AsTime}}</time>{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
+							<td>{{if .LastUpdateUnix}}<relative-time format="datetime" weekday="" year="numeric" month="short" day="numeric" hour="numeric" minute="numeric", second="numeric" datetime="{{.LastUpdateUnix.FormatLong}}">{{.LastUpdateUnix.AsTime}}</relative-time>{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
 							<td class="right aligned">
 								<form method="post" style="display: inline-block">
 									{{$.CsrfTokenHtml}}
diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl
index b7bc3060b21fd..b5d24f28b304f 100644
--- a/templates/repo/user_cards.tmpl
+++ b/templates/repo/user_cards.tmpl
@@ -18,7 +18,7 @@
 					{{else if .Location}}
 						{{svg "octicon-location"}} {{.Location}}
 					{{else}}
-						{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time>
+						{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time>
 					{{end}}
 				</div>
 			</li>
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 9540c872c2c5c..c00cf15e03568 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -34,7 +34,7 @@
 					</span>
 				{{end}}
 			</th>
-			<th class="text grey right age">{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When $.locale}}{{end}}{{end}}</th>
+			<th class="text grey right age">{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When}}{{end}}{{end}}</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -87,7 +87,7 @@
 						{{end}}
 					</span>
 				</td>
-				<td class="text right age three wide">{{if $commit}}{{TimeSince $commit.Committer.When $.locale}}{{end}}</td>
+				<td class="text right age three wide">{{if $commit}}{{TimeSince $commit.Committer.When}}{{end}}</td>
 			</tr>
 		{{end}}
 	</tbody>
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl
index 743574d0a5c72..171c5bab26920 100644
--- a/templates/repo/wiki/pages.tmpl
+++ b/templates/repo/wiki/pages.tmpl
@@ -20,7 +20,7 @@
 							{{svg "octicon-file"}}
 							<a href="{{$.RepoLink}}/wiki/{{.SubURL}}">{{.Name}}</a>
 						</td>
-						{{$timeSince := TimeSinceUnix .UpdatedUnix $.locale}}
+						{{$timeSince := TimeSinceUnix .UpdatedUnix}}
 						<td class="text right">{{$.locale.Tr "repo.wiki.last_updated" $timeSince | Safe}}</td>
 					</tr>
 				{{end}}
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index 0f540fbaa566c..94ebe3b99ae1b 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -14,7 +14,7 @@
 				<a class="file-revisions-btn ui basic button" title="{{.locale.Tr "repo.wiki.back_to_wiki"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}" ><span>{{.revision}}</span> {{svg "octicon-home"}}</a>
 				{{$title}}
 				<div class="ui sub header gt-word-break">
-					{{$timeSince := TimeSince .Author.When $.locale}}
+					{{$timeSince := TimeSince .Author.When}}
 					{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
 				</div>
 			</div>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index a1d1c047515be..8debc43bcbf5e 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -41,7 +41,7 @@
 					<a class="file-revisions-btn ui basic button" title="{{.locale.Tr "repo.wiki.file_revision"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_revision" ><span>{{.CommitCount}}</span> {{svg "octicon-history"}}</a>
 					{{$title}}
 					<div class="ui sub header">
-						{{$timeSince := TimeSince .Author.When $.locale}}
+						{{$timeSince := TimeSince .Author.When}}
 						{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
 					</div>
 				</div>
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 40b4924743226..b2b5c872c44f1 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -14,7 +14,7 @@
 				</div>
 				<div class="field gt-dib gt-mr-4 disabled">
 					<label>{{.locale.Tr "actions.runners.last_online"}}</label>
-					<span>{{TimeSinceUnix .Runner.LastOnline $.locale}}</span>
+					<span>{{TimeSinceUnix .Runner.LastOnline}}</span>
 				</div>
 				<div class="field gt-dib gt-mr-4 disabled">
 					<label>{{.locale.Tr "actions.runners.agent_labels"}}</label>
@@ -76,7 +76,7 @@
 						<strong><a href="{{.GetCommitLink}}" target="_blank">{{ShortSha .CommitSHA}}</a></strong>
 					</td>
 					<td>{{if .IsStopped}}
-						<span>{{TimeSinceUnix .Stopped $.locale}}</span>
+						<span>{{TimeSinceUnix .Stopped}}</span>
 						{{else}}-{{end}}</td>
 				</tr>
 				{{end}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl
index d4a5b863abc29..05022ca916f7d 100644
--- a/templates/shared/actions/runner_list.tmpl
+++ b/templates/shared/actions/runner_list.tmpl
@@ -70,7 +70,7 @@
 						<td class="runner-tags">
 							{{range .AllLabels}}<span class="ui label">{{.}}</span>{{end}}
 						</td>
-						<td>{{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{$.locale.Tr "never"}}{{end}}</td>
+						<td>{{if .LastOnline}}{{TimeSinceUnix .LastOnline}}{{else}}{{$.locale.Tr "never"}}{{end}}</td>
 						<td class="runner-ops">
 							{{if .Editable $.RunnerOnwerID $.RunnerRepoID}}
 							<a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a>
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
index 35994fc4354b9..337b414b0d0be 100644
--- a/templates/shared/issuelist.tmpl
+++ b/templates/shared/issuelist.tmpl
@@ -52,7 +52,7 @@
 							#{{.Index}}
 						{{end}}
 					</a>
-					{{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
+					{{$timeStr := TimeSinceUnix .GetLastEventTimestamp}}
 					{{if .OriginalAuthor}}
 						{{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
 					{{else if gt .Poster.ID 0}}
@@ -106,7 +106,7 @@
 						<span class="due-date" data-tooltip-content="{{$.locale.Tr "repo.issues.due_date"}}">
 							<span{{if .IsOverdue}} class="overdue"{{end}}>
 								{{svg "octicon-calendar" 14 "gt-mr-2"}}
-								<time data-format="short-date" datetime="{{.DeadlineUnix.FormatDate}}">{{.DeadlineUnix.FormatShort}}</time>
+								<relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.DeadlineUnix.FormatDate}}">{{.DeadlineUnix.FormatShort}}</relative-time>
 							</span>
 						</span>
 					{{end}}
diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl
index cce82721cd094..ca9ea8ababe62 100644
--- a/templates/shared/searchbottom.tmpl
+++ b/templates/shared/searchbottom.tmpl
@@ -6,7 +6,7 @@
 		</div>
 		<div class="gt-mr-4">
 			{{if not .result.UpdatedUnix.IsZero}}
-					<span class="ui grey text">{{.root.locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix .root.locale) | Safe}}</span>
+					<span class="ui grey text">{{.root.locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix) | Safe}}</span>
 			{{end}}
 		</div>
 </div>
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index 64daf4b2e7c45..819a2765bc289 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -114,7 +114,7 @@
 					<p class="text light grey">{{$.locale.Tr "action.review_dismissed_reason"}}</p>
 						<p class="text light grey">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</p>
 					{{end}}
-					<p class="text italic light grey">{{TimeSince .GetCreate $.locale}}</p>
+					<p class="text italic light grey">{{TimeSince .GetCreate}}</p>
 				</div>
 			</div>
 			<div class="ui two wide right aligned column">
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index 1c379ac09d025..d5f009839da03 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -91,7 +91,7 @@
 								</div>
 							</div>
 							<div class="meta">
-								{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
+								{{$closedDate:= TimeSinceUnix .ClosedDateUnix}}
 								{{if .IsClosed}}
 									{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 								{{else}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index d4a0f4a3ac8ed..9943389fdd475 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -55,7 +55,7 @@
 									</li>
 								{{end}}
 							{{end}}
-							<li>{{svg "octicon-clock"}} {{.locale.Tr "user.join_on"}} <time data-format="short-date" datetime="{{.Owner.CreatedUnix.FormatLong}}">{{.Owner.CreatedUnix.FormatShort}}</time></li>
+							<li>{{svg "octicon-clock"}} {{.locale.Tr "user.join_on"}} <relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.Owner.CreatedUnix.FormatLong}}">{{.Owner.CreatedUnix.FormatShort}}</relative-time></li>
 							{{if and .Orgs .HasOrgsVisible}}
 							<li>
 								<ul class="user-orgs">
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 23cd111229401..9e7e2f577b717 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -30,7 +30,7 @@
 								</ul>
 							</details>
 							<div class="activity meta">
-								<i>{{$.locale.Tr "settings.add_on"}} <span><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><time data-format="short-date" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+								<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
 							</div>
 						</div>
 					</div>
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 0adc98168378c..6ff5751dcd711 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -20,7 +20,7 @@
 				<div class="content">
 					<strong>{{$grant.Application.Name}}</strong>
 					<div class="activity meta">
-						<i>{{$.locale.Tr "settings.add_on"}} <span><time data-format="short-date" datetime="{{$grant.CreatedUnix.FormatLong}}">{{$grant.CreatedUnix.FormatShort}}</time></span></i>
+						<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{$grant.CreatedUnix.FormatLong}}">{{$grant.CreatedUnix.FormatShort}}</relative-time></span></i>
 					</div>
 				</div>
 			</div>
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 772fc4613b3d3..2b44294ef24af 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -68,9 +68,9 @@
 						<b>{{$.locale.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.PaddedKeyID}} {{end}}
 					</div>
 					<div class="activity meta">
-						<i>{{$.locale.Tr "settings.add_on"}} <span><time data-format="short-date" datetime="{{.AddedUnix.FormatLong}}">{{.AddedUnix.FormatShort}}</time></span></i>
+						<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.AddedUnix.FormatLong}}">{{.AddedUnix.FormatShort}}</relative-time></span></i>
 						-
-						<i>{{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until"}} <span><time data-format="short-date" datetime="{{.ExpiredUnix.FormatLong}}">{{.ExpiredUnix.FormatShort}}</time></span>{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}</i>
+						<i>{{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.ExpiredUnix.FormatLong}}">{{.ExpiredUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}</i>
 					</div>
 				</div>
 			</div>
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index a1563061123c3..e6404cf4a40af 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -25,7 +25,7 @@
 					<div class="content">
 						<strong>{{.Name}}</strong>
 						<div class="activity meta">
-							<i>{{$.locale.Tr "settings.add_on"}} <span><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span> —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><time data-format="short-date" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+							<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span> —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
 						</div>
 					</div>
 				</div>
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 5d518f3bb08e6..fb00d13fe2b77 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -58,7 +58,7 @@
 								{{.Fingerprint}}
 						</div>
 						<div class="activity meta">
-								<i>{{$.locale.Tr "settings.add_on"}} <span><time data-format="short-date" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</time></span> —	{{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><time data-format="short-date" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+								<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span> —	{{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
 						</div>
 				</div>
 			</div>
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 2fea2843f6e05..6cccc8a408e23 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -14,7 +14,7 @@
 				<div class="content">
 					<strong>{{.Name}}</strong>
 				</div>
-				<span class="time">{{TimeSinceUnix .CreatedUnix $.locale}}</span>
+				<span class="time">{{TimeSinceUnix .CreatedUnix}}</span>
 			</div>
 		{{end}}
 	</div>
diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index 176557799915a..0202a40887075 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -75,7 +75,10 @@ func testViewRepo(t *testing.T) {
 			}
 		})
 
-		f.commitTime, _ = s.Find("span.time-since").Attr("data-tooltip-content")
+		// convert "Wed, 14 Jun 2017 21:54:21 +0800" to "Wed, 14 Jun 2017 13:54:21 UTC"
+		htmlTimeString, _ := s.Find("relative-time.time-since").Attr("datetime")
+		htmlTime, _ := time.Parse("Mon, 02 Jan 2006 15:04:05 -0700", htmlTimeString)
+		f.commitTime = htmlTime.UTC().Format("Mon, 02 Jan 2006 15:04:05 UTC")
 		items = append(items, f)
 	})
 
diff --git a/web_src/js/features/formatting.js b/web_src/js/features/formatting.js
deleted file mode 100644
index 5590ba44d1448..0000000000000
--- a/web_src/js/features/formatting.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const {lang} = document.documentElement;
-const dateFormatter = new Intl.DateTimeFormat(lang, {year: 'numeric', month: 'long', day: 'numeric'});
-const shortDateFormatter = new Intl.DateTimeFormat(lang, {year: 'numeric', month: 'short', day: 'numeric'});
-const dateTimeFormatter = new Intl.DateTimeFormat(lang, {year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric'});
-
-export function initFormattingReplacements() {
-  // for each <time></time> tag, if it has the data-format attribute, format
-  // the text according to the user's chosen locale and formatter.
-  formatAllTimeElements();
-}
-
-function formatAllTimeElements() {
-  const timeElements = document.querySelectorAll('time[data-format]');
-  for (const timeElement of timeElements) {
-    const formatter = getFormatter(timeElement.dataset.format);
-    timeElement.textContent = formatter.format(new Date(timeElement.dateTime));
-  }
-}
-
-function getFormatter(format) {
-  switch (format) {
-    case 'date':
-      return dateFormatter;
-    case 'short-date':
-      return shortDateFormatter;
-    case 'date-time':
-      return dateTimeFormatter;
-    default:
-      throw new Error('Unknown format');
-  }
-}
diff --git a/web_src/js/index.js b/web_src/js/index.js
index f5584d29403a3..3ffc0e759926d 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -80,7 +80,6 @@ import {initRepoBranchButton} from './features/repo-branch.js';
 import {initCommonOrganization} from './features/common-organization.js';
 import {initRepoWikiForm} from './features/repo-wiki.js';
 import {initRepoCommentForm, initRepository} from './features/repo-legacy.js';
-import {initFormattingReplacements} from './features/formatting.js';
 import {initCopyContent} from './features/copycontent.js';
 import {initCaptcha} from './features/captcha.js';
 import {initRepositoryActionView} from './components/RepoActionView.vue';
@@ -89,10 +88,6 @@ import {initGiteaFomantic} from './modules/fomantic.js';
 import {onDomReady} from './utils/dom.js';
 import {initRepoIssueList} from './features/repo-issue-list.js';
 
-// Run time-critical code as soon as possible. This is safe to do because this
-// script appears at the end of <body> and rendered HTML is accessible at that point.
-// TODO: replace them with CustomElements
-initFormattingReplacements();
 // Init Gitea's Fomantic settings
 initGiteaFomantic();
 
diff --git a/web_src/js/webcomponents/README.md b/web_src/js/webcomponents/README.md
index 2b586a63d2562..0fde50731011f 100644
--- a/web_src/js/webcomponents/README.md
+++ b/web_src/js/webcomponents/README.md
@@ -10,9 +10,3 @@ https://developer.mozilla.org/en-US/docs/Web/Web_Components
   so they should have their own dependencies and should be very light,
   then they won't affect the page loading time too much.
 * If the component is not a public one, it's suggested to have its own `Gitea` or `gitea-` prefix to avoid conflicts.
-
-# TODO
-
-There are still some components that are not migrated to web components yet:
-
-* `<time data-format>`
diff --git a/web_src/js/webcomponents/webcomponents.js b/web_src/js/webcomponents/webcomponents.js
index 5c4afb1eecd11..7e8135aa00ccf 100644
--- a/web_src/js/webcomponents/webcomponents.js
+++ b/web_src/js/webcomponents/webcomponents.js
@@ -1,3 +1,4 @@
 import '@webcomponents/custom-elements'; // polyfill for some browsers like Pale Moon
+import '@github/relative-time-element';
 import './GiteaLocaleNumber.js';
 import './GiteaOriginUrl.js';

From baee7bd79e29fc5015499f63c7dce3262159269d Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Fri, 7 Apr 2023 21:44:58 +0000
Subject: [PATCH 02/35] Use shared templates

---
 templates/admin/auth/list.tmpl                      | 4 ++--
 templates/admin/notice.tmpl                         | 2 +-
 templates/admin/org/list.tmpl                       | 2 +-
 templates/admin/packages/list.tmpl                  | 2 +-
 templates/admin/repo/list.tmpl                      | 2 +-
 templates/admin/user/list.tmpl                      | 4 ++--
 templates/explore/organizations.tmpl                | 2 +-
 templates/explore/users.tmpl                        | 2 +-
 templates/package/shared/cleanup_rules/preview.tmpl | 2 +-
 templates/repo/activity.tmpl                        | 2 +-
 templates/repo/issue/view_content/sidebar.tmpl      | 2 +-
 templates/repo/settings/deploy_keys.tmpl            | 2 +-
 templates/repo/settings/options.tmpl                | 4 ++--
 templates/repo/user_cards.tmpl                      | 2 +-
 templates/shared/datetime/full.tmpl                 | 1 +
 templates/shared/datetime/long.tmpl                 | 1 +
 templates/shared/datetime/short.tmpl                | 1 +
 templates/shared/issuelist.tmpl                     | 2 +-
 templates/user/profile.tmpl                         | 2 +-
 templates/user/settings/applications.tmpl           | 2 +-
 templates/user/settings/grants_oauth2.tmpl          | 2 +-
 templates/user/settings/keys_gpg.tmpl               | 4 ++--
 templates/user/settings/keys_principal.tmpl         | 2 +-
 templates/user/settings/keys_ssh.tmpl               | 2 +-
 24 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 templates/shared/datetime/full.tmpl
 create mode 100644 templates/shared/datetime/long.tmpl
 create mode 100644 templates/shared/datetime/short.tmpl

diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index a7c5c19cd4ce9..3b8d17ff7d23d 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -29,8 +29,8 @@
 							<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
 							<td>{{.TypeName}}</td>
 							<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></td>
-							<td><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
 							<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index e3180fa04fce1..d236396dac38f 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -29,7 +29,7 @@
 							<td>{{.ID}}</td>
 							<td>{{$.locale.Tr .TrStr}}</td>
 							<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
-							<td><span class="notice-created-time"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span></td>
+							<td><span class="notice-created-time">{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span></td>
 							<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index e1aaeef5cf1a7..040a7b314ff76 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -44,7 +44,7 @@
 							<td>{{.NumTeams}}</td>
 							<td>{{.NumMembers}}</td>
 							<td>{{.NumRepos}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span></td>
+							<td><span title="{{.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span></td>
 							<td><a href="{{.OrganisationLink}}/settings">{{svg "octicon-pencil"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index edfcfe39cca82..cc8f10750edbc 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -68,7 +68,7 @@
 							{{end}}
 							</td>
 							<td>{{FileSize .CalculateBlobSize}}</td>
-							<td><span title="{{.Version.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.Version.CreatedUnix.FormatLong}}">{{.Version.CreatedUnix.FormatShort}}</relative-time></span></td>
+							<td><span title="{{.Version.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</span></td>
 							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 3f6c0c48e67b8..6ad65a59589f1 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -83,7 +83,7 @@
 							<td>{{.NumForks}}</td>
 							<td>{{.NumIssues}}</td>
 							<td>{{FileSize .Size}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span></td>
+							<td><span title="{{.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span></td>
 							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 974913962cecc..dcc68ffc0b075 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -94,9 +94,9 @@
 							<td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{.NumRepos}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span></td>
+							<td><span title="{{.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span></td>
 							{{if .LastLoginUnix}}
-								<td><span title="{{.LastLoginUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.LastLoginUnix.FormatLong}}">{{.LastLoginUnix.FormatShort}}</relative-time></span></td>
+								<td><span title="{{.LastLoginUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</span></td>
 							{{else}}
 								<td><span>{{$.locale.Tr "admin.users.never_login"}}</span></td>
 							{{end}}
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index 9357589da69a3..fe9359251b7f1 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -23,7 +23,7 @@
 								{{svg "octicon-link"}}
 								<a href="{{.Website}}" rel="nofollow">{{.Website}}</a>
 							{{end}}
-							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time>
+							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}
 						</div>
 					</div>
 				</div>
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index 1f8430aeb0fe4..5dbc4ef6e7463 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -18,7 +18,7 @@
 								{{svg "octicon-mail"}}
 								<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
 							{{end}}
-							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time>
+							{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}
 						</div>
 					</div>
 				</div>
diff --git a/templates/package/shared/cleanup_rules/preview.tmpl b/templates/package/shared/cleanup_rules/preview.tmpl
index 1101d57072220..745a6dd4f2a95 100644
--- a/templates/package/shared/cleanup_rules/preview.tmpl
+++ b/templates/package/shared/cleanup_rules/preview.tmpl
@@ -22,7 +22,7 @@
 					<td><a href="{{.FullWebLink}}">{{.Version.Version}}</a></td>
 					<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
 					<td>{{FileSize .CalculateBlobSize}}</td>
-					<td><span title="{{.Version.CreatedUnix.FormatLong}}"><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.Version.CreatedUnix.FormatLong}}">{{.Version.CreatedUnix.FormatShort}}</relative-time></span></td>
+					<td><span title="{{.Version.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</span></td>
 				</tr>
 			{{else}}
 				<tr>
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index 3f71951d88bfe..da2464d2d2f00 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -2,7 +2,7 @@
 <div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
-		<h2 class="ui header"><relative-time format="datetime" year="numeric" month="long" day="numeric" weekday="" datetime="{{.DateFrom}}">{{.DateFrom}}</relative-time> - <relative-time format="datetime" year="numeric" month="long" day="numeric" weekday="" datetime="{{.DateUntil}}">{{.DateUntil}}</relative-time>
+		<h2 class="ui header">{{template "shared/datetime/long" (dict "Datetime" .DateFrom "Fallback" .DateFrom)}} - {{template "shared/datetime/long" (dict "Datetime" .DateUntil "Fallback" .DateUntil)}}
 			<div class="ui right">
 				<!-- Period -->
 				<div class="ui floating dropdown jump filter">
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 2741924a28cb0..a2f12083c6394 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -385,7 +385,7 @@
 					<div class="gt-df gt-sb gt-ac">
 						<div class="due-date {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-tooltip-content="{{.locale.Tr "repo.issues.due_date_overdue"}}"{{end}}>
 							{{svg "octicon-calendar" 16 "gt-mr-3"}}
-							<relative-time format="datetime" year="numeric" month="long" day="numeric" weekday="" datetime="{{.Issue.DeadlineUnix.FormatDate}}">{{.Issue.DeadlineUnix.FormatDate}}</relative-time>
+							{{template "shared/datetime/long" (dict "Datetime" .Issue.DeadlineUnix.FormatDate "Fallback" .Issue.DeadlineUnix.FormatDate)}}
 						</div>
 						<div>
 							{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index d712ad740b31c..33f3937201db1 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -64,7 +64,7 @@
 									{{.Fingerprint}}
 								</div>
 								<div class="activity meta">
-									<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
+									<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
 								</div>
 							</div>
 						</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index c0ffbcd004b3a..1aaf58ee91ca5 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -93,7 +93,7 @@
 						<tr>
 							<td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false).Address}}</td>
 							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
-							<td><relative-time format="datetime" weekday="" year="numeric" month="short" day="numeric" hour="numeric" minute="numeric", second="numeric" datetime="{{.Mirror.UpdatedUnix.FormatLong}}">{{.Mirror.UpdatedUnix.AsTime}}</relative-time></td>
+							<td>{{template "shared/datetime/full" (dict "Datetime" .Mirror.UpdatedUnix.FormatLong "Fallback" .Mirror.UpdatedUnix.AsTime)}}</td>
 							<td class="right aligned">
 								<form method="post" style="display: inline-block">
 									{{.CsrfTokenHtml}}
@@ -171,7 +171,7 @@
 							{{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
 							<td>{{$address.Address}}</td>
 							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
-							<td>{{if .LastUpdateUnix}}<relative-time format="datetime" weekday="" year="numeric" month="short" day="numeric" hour="numeric" minute="numeric", second="numeric" datetime="{{.LastUpdateUnix.FormatLong}}">{{.LastUpdateUnix.AsTime}}</relative-time>{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
+							<td>{{if .LastUpdateUnix}}{{template "shared/datetime/full" (dict "Datetime" .LastUpdateUnix.FormatLong "Fallback" .LastUpdateUnix.AsTime)}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
 							<td class="right aligned">
 								<form method="post" style="display: inline-block">
 									{{$.CsrfTokenHtml}}
diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl
index b5d24f28b304f..a48fd41744c8e 100644
--- a/templates/repo/user_cards.tmpl
+++ b/templates/repo/user_cards.tmpl
@@ -18,7 +18,7 @@
 					{{else if .Location}}
 						{{svg "octicon-location"}} {{.Location}}
 					{{else}}
-						{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} <relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time>
+						{{svg "octicon-clock"}} {{$.locale.Tr "user.join_on"}} {{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}
 					{{end}}
 				</div>
 			</li>
diff --git a/templates/shared/datetime/full.tmpl b/templates/shared/datetime/full.tmpl
new file mode 100644
index 0000000000000..1c55a4b53ee25
--- /dev/null
+++ b/templates/shared/datetime/full.tmpl
@@ -0,0 +1 @@
+<relative-time format="datetime" weekday="" year="numeric" month="short" day="numeric" hour="numeric" minute="numeric" second="numeric" datetime="{{.Datetime}}">{{.Fallback}}</relative-time>
diff --git a/templates/shared/datetime/long.tmpl b/templates/shared/datetime/long.tmpl
new file mode 100644
index 0000000000000..4880cf3f91880
--- /dev/null
+++ b/templates/shared/datetime/long.tmpl
@@ -0,0 +1 @@
+<relative-time format="datetime" year="numeric" month="long" day="numeric" weekday="" datetime="{{.Datetime}}">{{.Fallback}}</relative-time>
diff --git a/templates/shared/datetime/short.tmpl b/templates/shared/datetime/short.tmpl
new file mode 100644
index 0000000000000..e5bcef6459342
--- /dev/null
+++ b/templates/shared/datetime/short.tmpl
@@ -0,0 +1 @@
+<relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.Datetime}}">{{.Fallback}}</relative-time>
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
index 337b414b0d0be..32c4e5c2a8158 100644
--- a/templates/shared/issuelist.tmpl
+++ b/templates/shared/issuelist.tmpl
@@ -106,7 +106,7 @@
 						<span class="due-date" data-tooltip-content="{{$.locale.Tr "repo.issues.due_date"}}">
 							<span{{if .IsOverdue}} class="overdue"{{end}}>
 								{{svg "octicon-calendar" 14 "gt-mr-2"}}
-								<relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.DeadlineUnix.FormatDate}}">{{.DeadlineUnix.FormatShort}}</relative-time>
+								{{template "shared/datetime/short" (dict "Datetime" .DeadlineUnix.FormatDate "Fallback" .DeadlineUnix.FormatShort)}}
 							</span>
 						</span>
 					{{end}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 9943389fdd475..8316622ae4d96 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -55,7 +55,7 @@
 									</li>
 								{{end}}
 							{{end}}
-							<li>{{svg "octicon-clock"}} {{.locale.Tr "user.join_on"}} <relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.Owner.CreatedUnix.FormatLong}}">{{.Owner.CreatedUnix.FormatShort}}</relative-time></li>
+							<li>{{svg "octicon-clock"}} {{.locale.Tr "user.join_on"}} {{template "shared/datetime/short" (dict "Datetime" .Owner.CreatedUnix.FormatLong "Fallback" .Owner.CreatedUnix.FormatShort)}}</li>
 							{{if and .Orgs .HasOrgsVisible}}
 							<li>
 								<ul class="user-orgs">
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 9e7e2f577b717..2694f5cad0d40 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -30,7 +30,7 @@
 								</ul>
 							</details>
 							<div class="activity meta">
-								<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+								<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
 							</div>
 						</div>
 					</div>
diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 6ff5751dcd711..3b92f35f37afe 100644
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -20,7 +20,7 @@
 				<div class="content">
 					<strong>{{$grant.Application.Name}}</strong>
 					<div class="activity meta">
-						<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{$grant.CreatedUnix.FormatLong}}">{{$grant.CreatedUnix.FormatShort}}</relative-time></span></i>
+						<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" $grant.CreatedUnix.FormatLong "Fallback" $grant.CreatedUnix.FormatShort)}}</span></i>
 					</div>
 				</div>
 			</div>
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 2b44294ef24af..9ba9199db70d8 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -68,9 +68,9 @@
 						<b>{{$.locale.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.PaddedKeyID}} {{end}}
 					</div>
 					<div class="activity meta">
-						<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.AddedUnix.FormatLong}}">{{.AddedUnix.FormatShort}}</relative-time></span></i>
+						<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .AddedUnix.FormatLong "Fallback" .AddedUnix.FormatShort)}}</span></i>
 						-
-						<i>{{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.ExpiredUnix.FormatLong}}">{{.ExpiredUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}</i>
+						<i>{{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until"}} <span>{{template "shared/datetime/short" (dict "Datetime" .ExpiredUnix.FormatLong "Fallback" .ExpiredUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}</i>
 					</div>
 				</div>
 			</div>
diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index e6404cf4a40af..6194db13ab7ca 100644
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -25,7 +25,7 @@
 					<div class="content">
 						<strong>{{.Name}}</strong>
 						<div class="activity meta">
-							<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span> —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+							<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
 						</div>
 					</div>
 				</div>
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index fb00d13fe2b77..5f46c77943b66 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -58,7 +58,7 @@
 								{{.Fingerprint}}
 						</div>
 						<div class="activity meta">
-								<i>{{$.locale.Tr "settings.add_on"}} <span><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</relative-time></span> —	{{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}><relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="{{.UpdatedUnix.FormatLong}}">{{.UpdatedUnix.FormatShort}}</relative-time></span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+								<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> —	{{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
 						</div>
 				</div>
 			</div>

From f9c0e98fddd2cead0e4c29d1ea9a01aae5ea41e0 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 8 Apr 2023 11:50:49 +0000
Subject: [PATCH 03/35] Use `tense="path"` to avoid the unlocalized `on`

---
 modules/timeutil/since.go | 2 +-
 test                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 160000 test

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index b7f9a60e13ff3..27bfdeeb0af1d 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -117,7 +117,7 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(then time.Time) template.HTML {
 	timestamp := then.Format(time.RFC1123)
-	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" datetime="%s">%s</relative-time>`, timestamp, timestamp))
+	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" tense="past" datetime="%s">%s</relative-time>`, timestamp, timestamp))
 }
 
 // TimeSinceUnix calculates the time interval and generate user-friendly string.
diff --git a/test b/test
new file mode 160000
index 0000000000000..8478470d139b6
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+Subproject commit 8478470d139b60d12facf2f572d75e9d43ebf83b

From 359706e2e30c85a272521bd5647602464c0c7141 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 8 Apr 2023 11:53:59 +0000
Subject: [PATCH 04/35] Remove test file

---
 test | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 test

diff --git a/test b/test
deleted file mode 160000
index 8478470d139b6..0000000000000
--- a/test
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8478470d139b60d12facf2f572d75e9d43ebf83b

From 4801743e8564a5af04acda250bee2ba390aa2b35 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 8 Apr 2023 14:48:46 +0000
Subject: [PATCH 05/35] Use a better format for javascript parsing

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 modules/timeutil/since.go  | 2 +-
 routers/web/admin/admin.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 27bfdeeb0af1d..5c42080b84e00 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -116,7 +116,7 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(then time.Time) template.HTML {
-	timestamp := then.Format(time.RFC1123)
+	timestamp := then.Format("2006-01-02 15:04:05 -07:00")
 	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" tense="past" datetime="%s">%s</relative-time>`, timestamp, timestamp))
 }
 
diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go
index cc18059611a8d..086aab14ac545 100644
--- a/routers/web/admin/admin.go
+++ b/routers/web/admin/admin.go
@@ -73,7 +73,7 @@ var sysStatus struct {
 }
 
 func updateSystemStatus() {
-	sysStatus.StartTime = setting.AppStartTime.Format(time.RFC1123)
+	sysStatus.StartTime = setting.AppStartTime.Format("2006-01-02 15:04:05 -07:00")
 
 	m := new(runtime.MemStats)
 	runtime.ReadMemStats(m)

From 113aaf70aeee387bffd9a2a62fa7bc3e6425300c Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 8 Apr 2023 16:03:30 +0000
Subject: [PATCH 06/35] Fix tests

---
 tests/integration/repo_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index 0202a40887075..aeb81cacd7254 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -77,7 +77,7 @@ func testViewRepo(t *testing.T) {
 
 		// convert "Wed, 14 Jun 2017 21:54:21 +0800" to "Wed, 14 Jun 2017 13:54:21 UTC"
 		htmlTimeString, _ := s.Find("relative-time.time-since").Attr("datetime")
-		htmlTime, _ := time.Parse("Mon, 02 Jan 2006 15:04:05 -0700", htmlTimeString)
+		htmlTime, _ := time.Parse("2006-01-02 15:04:05 -07:00", htmlTimeString)
 		f.commitTime = htmlTime.UTC().Format("Mon, 02 Jan 2006 15:04:05 UTC")
 		items = append(items, f)
 	})

From fc6b5c34031e781e1fd46ef628b3cb5d74d40eb1 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 8 Apr 2023 16:04:31 +0000
Subject: [PATCH 07/35] Drop tense=past to support future dates

Just remove `on`
---
 modules/timeutil/since.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 5c42080b84e00..8ef0ad1f5fa36 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -117,7 +117,7 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(then time.Time) template.HTML {
 	timestamp := then.Format("2006-01-02 15:04:05 -07:00")
-	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" tense="past" datetime="%s">%s</relative-time>`, timestamp, timestamp))
+	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="" datetime="%s">%s</relative-time>`, timestamp, timestamp))
 }
 
 // TimeSinceUnix calculates the time interval and generate user-friendly string.

From f2838d9b412a9fc5fd57c61c44505a058982a125 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 8 Apr 2023 16:16:34 +0000
Subject: [PATCH 08/35] Update comment

---
 tests/integration/repo_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index aeb81cacd7254..c7ddec321b7ae 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -75,7 +75,7 @@ func testViewRepo(t *testing.T) {
 			}
 		})
 
-		// convert "Wed, 14 Jun 2017 21:54:21 +0800" to "Wed, 14 Jun 2017 13:54:21 UTC"
+		// convert "2017-06-14 21:54:21 +0800" to "Wed, 14 Jun 2017 13:54:21 UTC"
 		htmlTimeString, _ := s.Find("relative-time.time-since").Attr("datetime")
 		htmlTime, _ := time.Parse("2006-01-02 15:04:05 -07:00", htmlTimeString)
 		f.commitTime = htmlTime.UTC().Format("Mon, 02 Jan 2006 15:04:05 UTC")

From def997803ac7cce5dc14e9b4fcea43c69951c925 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 8 Apr 2023 17:24:45 +0000
Subject: [PATCH 09/35] Localize `on`

---
 modules/timeutil/since.go                       |  8 ++++----
 routers/web/repo/blame.go                       |  2 +-
 routers/web/repo/issue_content_history.go       |  2 +-
 templates/admin/process-row.tmpl                |  2 +-
 templates/admin/stacktrace-row.tmpl             |  2 +-
 templates/explore/repo_list.tmpl                |  2 +-
 templates/package/shared/list.tmpl              |  2 +-
 templates/package/shared/versionlist.tmpl       |  2 +-
 templates/package/view.tmpl                     |  4 ++--
 templates/projects/list.tmpl                    |  2 +-
 templates/projects/view.tmpl                    |  2 +-
 templates/repo/actions/runs_list.tmpl           |  2 +-
 templates/repo/activity.tmpl                    | 12 ++++++------
 templates/repo/branch/list.tmpl                 |  6 +++---
 templates/repo/commit_page.tmpl                 |  4 ++--
 templates/repo/commits_list.tmpl                |  4 ++--
 templates/repo/diff/comments.tmpl               |  2 +-
 templates/repo/issue/milestone_issues.tmpl      |  2 +-
 templates/repo/issue/milestones.tmpl            |  2 +-
 templates/repo/issue/view_content.tmpl          |  2 +-
 templates/repo/issue/view_content/comments.tmpl |  6 +++---
 templates/repo/issue/view_content/pull.tmpl     |  6 +++---
 templates/repo/issue/view_title.tmpl            |  4 ++--
 templates/repo/projects/list.tmpl               |  2 +-
 templates/repo/projects/view.tmpl               |  2 +-
 templates/repo/release/list.tmpl                |  6 +++---
 templates/repo/settings/lfs.tmpl                |  2 +-
 templates/repo/settings/lfs_file_find.tmpl      |  2 +-
 templates/repo/settings/lfs_locks.tmpl          |  2 +-
 templates/repo/view_list.tmpl                   |  4 ++--
 templates/repo/wiki/pages.tmpl                  |  4 ++--
 templates/repo/wiki/revision.tmpl               |  4 ++--
 templates/repo/wiki/view.tmpl                   |  4 ++--
 templates/shared/actions/runner_edit.tmpl       |  4 ++--
 templates/shared/actions/runner_list.tmpl       |  2 +-
 templates/shared/issuelist.tmpl                 |  2 +-
 templates/shared/searchbottom.tmpl              |  2 +-
 templates/user/dashboard/feeds.tmpl             |  2 +-
 templates/user/dashboard/milestones.tmpl        |  2 +-
 templates/user/settings/security/webauthn.tmpl  |  2 +-
 40 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 8ef0ad1f5fa36..192b2ff4d73ae 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -115,12 +115,12 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 }
 
 // TimeSince calculates the time interval and generate user-friendly string.
-func TimeSince(then time.Time) template.HTML {
+func TimeSince(then time.Time, lang translation.Locale) template.HTML {
 	timestamp := then.Format("2006-01-02 15:04:05 -07:00")
-	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="" datetime="%s">%s</relative-time>`, timestamp, timestamp))
+	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s">%s</relative-time>`, lang.Tr("packages.versions.on"), timestamp, timestamp))
 }
 
 // TimeSinceUnix calculates the time interval and generate user-friendly string.
-func TimeSinceUnix(then TimeStamp) template.HTML {
-	return TimeSince(then.AsTime())
+func TimeSinceUnix(then TimeStamp, lang translation.Locale) template.HTML {
+	return TimeSince(then.AsTime(), lang)
 }
diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go
index b470543894243..3546334ed6479 100644
--- a/routers/web/repo/blame.go
+++ b/routers/web/repo/blame.go
@@ -258,7 +258,7 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m
 				commitCnt++
 
 				// User avatar image
-				commitSince := timeutil.TimeSinceUnix(timeutil.TimeStamp(commit.Author.When.Unix()))
+				commitSince := timeutil.TimeSinceUnix(timeutil.TimeStamp(commit.Author.When.Unix()), ctx.Locale)
 
 				var avatar string
 				if commit.User != nil {
diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go
index 95b3dc2d84779..7e5295e757b7c 100644
--- a/routers/web/repo/issue_content_history.go
+++ b/routers/web/repo/issue_content_history.go
@@ -74,7 +74,7 @@ func GetContentHistoryList(ctx *context.Context) {
 		class := avatars.DefaultAvatarClass + " gt-mr-3"
 		name := html.EscapeString(username)
 		avatarHTML := string(templates.AvatarHTML(src, 28, class, username))
-		timeSinceText := string(timeutil.TimeSinceUnix(item.EditedUnix))
+		timeSinceText := string(timeutil.TimeSinceUnix(item.EditedUnix, ctx.Locale))
 
 		results = append(results, map[string]interface{}{
 			"name":  avatarHTML + "<strong>" + name + "</strong> " + actionText + " " + timeSinceText,
diff --git a/templates/admin/process-row.tmpl b/templates/admin/process-row.tmpl
index 81d45897b17b0..79ffa44900c18 100644
--- a/templates/admin/process-row.tmpl
+++ b/templates/admin/process-row.tmpl
@@ -3,7 +3,7 @@
 		<div class="icon gt-ml-3 gt-mr-3">{{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}}</div>
 		<div class="content gt-f1">
 			<div class="header">{{.Process.Description}}</div>
-			<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start}}</span></div>
+			<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start $.locale}}</span></div>
 		</div>
 		<div>
 			{{if ne .Process.Type "system"}}
diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl
index b3abe52216df0..6fef98ae6fff3 100644
--- a/templates/admin/stacktrace-row.tmpl
+++ b/templates/admin/stacktrace-row.tmpl
@@ -13,7 +13,7 @@
 		</div>
 		<div class="content gt-f1">
 			<div class="header">{{.Process.Description}}</div>
-			<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start}}</span>{{end}}</div>
+			<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start $.locale}}</span>{{end}}</div>
 		</div>
 		<div>
 			{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}}
diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index 8e9737a699f26..b311472b43ed2 100644
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -60,7 +60,7 @@
 					{{end}}
 					</div>
 				{{end}}
-				<p class="time">{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix}}</p>
+				<p class="time">{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.locale}}</p>
 			</div>
 		</div>
 	{{else}}
diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl
index 864ffd382fcf4..2b6398fcd6705 100644
--- a/templates/package/shared/list.tmpl
+++ b/templates/package/shared/list.tmpl
@@ -22,7 +22,7 @@
 						<span class="ui label">{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}</span>
 					</div>
 					<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
-						{{$timeStr := TimeSinceUnix .Version.CreatedUnix}}
+						{{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}}
 						{{$hasRepositoryAccess := false}}
 						{{if .Repository}}
 							{{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}}
diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl
index c1c612f480e4c..ba488586a82e6 100644
--- a/templates/package/shared/versionlist.tmpl
+++ b/templates/package/shared/versionlist.tmpl
@@ -27,7 +27,7 @@
 						<a class="title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a>
 					</div>
 					<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
-						{{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
+						{{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
 					</div>
 				</div>
 			</li>
diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index ea9cae3bcee2a..beadcf5c1e8a3 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -9,7 +9,7 @@
 						<h1>{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})</h1>
 					</div>
 					<div>
-						{{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix}}
+						{{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}}
 						{{if .HasRepositoryAccess}}
 							{{.locale.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink (.PackageDescriptor.Creator.GetDisplayName | Escape) .PackageDescriptor.Repository.Link (.PackageDescriptor.Repository.FullName | Escape) | Safe}}
 						{{else}}
@@ -44,7 +44,7 @@
 							{{if .HasRepositoryAccess}}
 							<div class="item">{{svg "octicon-repo" 16 "gt-mr-3"}} <a href="{{.PackageDescriptor.Repository.Link}}">{{.PackageDescriptor.Repository.FullName}}</a></div>
 							{{end}}
-							<div class="item">{{svg "octicon-calendar" 16 "gt-mr-3"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix}}</div>
+							<div class="item">{{svg "octicon-calendar" 16 "gt-mr-3"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}}</div>
 							<div class="item">{{svg "octicon-download" 16 "gt-mr-3"}} {{.PackageDescriptor.Version.DownloadCount}}</div>
 							{{template "package/metadata/cargo" .}}
 							{{template "package/metadata/chef" .}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index a15a9682a7780..73ae5ab6e4076 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -40,7 +40,7 @@
 				<li class="item">
 					{{svg .IconName}} <a href="{{.Link}}">{{.Title}}</a>
 					<div class="meta">
-						{{$closedDate:= TimeSinceUnix .ClosedDateUnix}}
+						{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
 						{{if .IsClosed}}
 							{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 						{{end}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 58cadd44e6163..20c95c82789a6 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -203,7 +203,7 @@
 							<div class="meta gt-my-2">
 								<span class="text light grey">
 									{{.Repo.FullName}}#{{.Index}}
-									{{$timeStr := TimeSinceUnix .GetLastEventTimestamp}}
+									{{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
 									{{if .OriginalAuthor}}
 										{{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
 									{{else if gt .Poster.ID 0}}
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index 357401114b311..a28b9d71378b5 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -23,7 +23,7 @@
 				</div>
 			</div>
 			<div class="issue-item-right">
-				<div>{{TimeSinceUnix .Updated}}</div>
+				<div>{{TimeSinceUnix .Updated $.locale}}</div>
 				<div>{{.Duration}}</div>
 			</div>
 		</li>
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index da2464d2d2f00..aa71fe838b710 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -131,7 +131,7 @@
 						{{if not .IsTag}}
 							<a class="title" href="{{$.RepoLink}}/src/{{.TagName | PathEscapeSegments}}">{{.Title | RenderEmoji $.Context}}</a>
 						{{end}}
-						{{TimeSinceUnix .CreatedUnix}}
+						{{TimeSinceUnix .CreatedUnix $.locale}}
 					</p>
 				{{end}}
 			</div>
@@ -150,7 +150,7 @@
 					<p class="desc">
 						<span class="ui purple label">{{$.locale.Tr "repo.activity.merged_prs_label"}}</span>
 						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .MergedUnix}}
+						{{TimeSinceUnix .MergedUnix $.locale}}
 					</p>
 				{{end}}
 			</div>
@@ -169,7 +169,7 @@
 					<p class="desc">
 						<span class="ui green label">{{$.locale.Tr "repo.activity.opened_prs_label"}}</span>
 						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .Issue.CreatedUnix}}
+						{{TimeSinceUnix .Issue.CreatedUnix $.locale}}
 					</p>
 				{{end}}
 			</div>
@@ -188,7 +188,7 @@
 					<p class="desc">
 						<span class="ui red label">{{$.locale.Tr "repo.activity.closed_issue_label"}}</span>
 						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .ClosedUnix}}
+						{{TimeSinceUnix .ClosedUnix $.locale}}
 					</p>
 				{{end}}
 			</div>
@@ -207,7 +207,7 @@
 					<p class="desc">
 						<span class="ui green label">{{$.locale.Tr "repo.activity.new_issue_label"}}</span>
 						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .CreatedUnix}}
+						{{TimeSinceUnix .CreatedUnix $.locale}}
 					</p>
 				{{end}}
 			</div>
@@ -231,7 +231,7 @@
 						{{else}}
 						<a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
 						{{end}}
-						{{TimeSinceUnix .UpdatedUnix}}
+						{{TimeSinceUnix .UpdatedUnix $.locale}}
 					</p>
 				{{end}}
 			</div>
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 196912159cd82..1f491cedb1ce7 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -18,7 +18,7 @@
 									{{svg "octicon-shield-lock"}}
 								{{end}}
 								<a href="{{.RepoLink}}/src/branch/{{PathEscapeSegments .DefaultBranch}}">{{.DefaultBranch}}</a>
-								<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.Commit.ID.String}}">{{ShortSha .DefaultBranchBranch.Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}}</span> · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.Commit.Committer.When}}</p>
+								<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.Commit.ID.String}}">{{ShortSha .DefaultBranchBranch.Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}}</span> · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.Commit.Committer.When $.locale}}</p>
 							</td>
 							<td class="right aligned overflow-visible">
 								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
@@ -55,13 +55,13 @@
 									<td class="six wide">
 									{{if .IsDeleted}}
 										<s><a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments .Name}}">{{.Name}}</a></s>
-										<p class="info">{{$.locale.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix}}</p>
+										<p class="info">{{$.locale.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.locale}}</p>
 									{{else}}
 										{{if .IsProtected}}
 											{{svg "octicon-shield-lock"}}
 										{{end}}
 										<a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments .Name}}">{{.Name}}</a>
-										<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.locale.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When}}</p>
+										<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.locale.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.locale}}</p>
 									{{end}}
 									</td>
 									<td class="three wide ui">
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 6167bbcb89d55..8d72cd1420246 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -156,7 +156,7 @@
 						{{avatarByEmail $.Context .Commit.Author.Email .Commit.Author.Email 28 "gt-mr-3"}}
 						<strong>{{.Commit.Author.Name}}</strong>
 					{{end}}
-					<span class="text grey gt-ml-3" id="authored-time">{{TimeSince .Commit.Author.When}}</span>
+					<span class="text grey gt-ml-3" id="authored-time">{{TimeSince .Commit.Author.When $.locale}}</span>
 					{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
 						<span class="text grey gt-mx-3">{{.locale.Tr "repo.diff.committed_by"}}</span>
 						{{if ne .Verification.CommittingUser.ID 0}}
@@ -277,7 +277,7 @@
 				{{else}}
 					<strong>{{.NoteCommit.Author.Name}}</strong>
 				{{end}}
-				<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When}}</span>
+				<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.locale}}</span>
 			</div>
 			<div class="ui bottom attached info segment git-notes">
 				<pre class="commit-body">{{RenderNote $.Context .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index 94a9c8e0dcea8..36333c554079c 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -76,9 +76,9 @@
 							{{end}}
 						</td>
 						{{if .Committer}}
-							<td class="text right aligned">{{TimeSince .Committer.When}}</td>
+							<td class="text right aligned">{{TimeSince .Committer.When $.locale}}</td>
 						{{else}}
-							<td class="text right aligned">{{TimeSince .Author.When}}</td>
+							<td class="text right aligned">{{TimeSince .Author.When $.locale}}</td>
 						{{end}}
 					</tr>
 				{{end}}
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 20c624cc010fa..12a5fa8fa0ad8 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -1,6 +1,6 @@
 {{range .comments}}
 
-{{$createdStr:= TimeSinceUnix .CreatedUnix}}
+{{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
 <div class="comment" id="{{.HashTag}}">
 	{{if .OriginalAuthor}}
 		<span class="avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index a4d019d622fb0..123845de68fa3 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -29,7 +29,7 @@
 		</div>
 		<div class="ui one column stackable grid">
 			<div class="column">
-				{{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix}}
+				{{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}}
 				{{if .IsClosed}}
 					{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 				{{else}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 6b37d64e65c63..0336d35c17872 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -71,7 +71,7 @@
 						</div>
 					</div>
 					<div class="meta">
-						{{$closedDate:= TimeSinceUnix .ClosedDateUnix}}
+						{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
 						{{if .IsClosed}}
 							{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 						{{else}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index f8b3fb414bd8b..a5d9b0bde0acf 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -15,7 +15,7 @@
 	<input type="hidden" id="issueIndex" value="{{.Issue.Index}}">
 	<input type="hidden" id="type" value="{{.IssueType}}">
 
-	{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix}}
+	{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
 	<div class="twelve wide column comment-list prevent-before-timeline">
 		<div class="ui timeline">
 			<div id="{{.Issue.HashTag}}" class="timeline-item comment first">
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 9f7d4c4c00c3c..91bef4fe1ac7b 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -1,7 +1,7 @@
 {{template "base/alert"}}
 {{range .Issue.Comments}}
 	{{if call $.ShouldShowCommentType .Type}}
-		{{$createdStr:= TimeSinceUnix .CreatedUnix}}
+		{{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
 
 		<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
 		5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING,
@@ -144,7 +144,7 @@
 			{{else if eq .RefAction 2}}
 				{{$refTr = "repo.issues.ref_reopening_from"}}
 			{{end}}
-			{{$createdStr:= TimeSinceUnix .CreatedUnix}}
+			{{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-bookmark"}}</span>
 				{{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}}
@@ -522,7 +522,7 @@
 									<div id="code-comments-{{(index $comms 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} gt-hidden{{end}}">
 										<div class="ui comments gt-mb-0">
 											{{range $comms}}
-												{{$createdSubStr:= TimeSinceUnix .CreatedUnix}}
+												{{$createdSubStr:= TimeSinceUnix .CreatedUnix $.locale}}
 												<div class="comment code-comment gt-pb-4" id="{{.HashTag}}">
 													<div class="content">
 														<div class="header comment-header">
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 5e49e9e0ef0cd..8b758b2ac09a4 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -4,7 +4,7 @@
 			<div class="ui segment">
 				<h4>{{$.locale.Tr "repo.issues.review.reviewers"}}</h4>
 				{{range .PullReviewers}}
-					{{$createdStr:= TimeSinceUnix .Review.UpdatedUnix}}
+					{{$createdStr:= TimeSinceUnix .Review.UpdatedUnix $.locale}}
 					<div class="ui divider"></div>
 					<div class="review-item">
 						<div class="review-item-left">
@@ -82,7 +82,7 @@
 					</div>
 				{{end}}
 				{{range .OriginalReviews}}
-					{{$createdStr:= TimeSinceUnix .UpdatedUnix}}
+					{{$createdStr:= TimeSinceUnix .UpdatedUnix $.locale}}
 					<div class="ui divider"></div>
 					<div class="review-item">
 						<div class="review-item-left">
@@ -301,7 +301,7 @@
 					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash}}
 						{{$hasPendingPullRequestMergeTip := ""}}
 						{{if .HasPendingPullRequestMerge}}
-							{{$createdPRMergeStr := TimeSinceUnix .PendingPullRequestMerge.CreatedUnix}}
+							{{$createdPRMergeStr := TimeSinceUnix .PendingPullRequestMerge.CreatedUnix $.locale}}
 							{{$hasPendingPullRequestMergeTip = $.locale.Tr "repo.pulls.auto_merge_has_pending_schedule" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr}}
 						{{end}}
 						<div class="ui divider"></div>
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
index c8f4de805927d..cf12daee04ddb 100644
--- a/templates/repo/issue/view_title.tmpl
+++ b/templates/repo/issue/view_title.tmpl
@@ -42,7 +42,7 @@
 			{{$baseHref = printf "<a href=\"%s\">%s</a>" (.BaseBranchLink | Escape) $baseHref}}
 		{{end}}
 		{{if .Issue.PullRequest.HasMerged}}
-			{{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix}}
+			{{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.locale}}
 			{{if .Issue.OriginalAuthor}}
 				{{.Issue.OriginalAuthor}}
 				<span class="pull-desc">{{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}}</span>
@@ -90,7 +90,7 @@
 			</span>
 		{{end}}
 	{{else}}
-		{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix}}
+		{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
 		<span class="time-desc">
 			{{if .Issue.OriginalAuthor}}
 				{{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.OriginalAuthor|Escape) | Safe}}
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 982194c690650..227a2727055c7 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -42,7 +42,7 @@
 				<li class="item">
 					{{svg .IconName}} <a href="{{.Link}}">{{.Title}}</a>
 					<div class="meta">
-						{{$closedDate:= TimeSinceUnix .ClosedDateUnix}}
+						{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
 						{{if .IsClosed}}
 							{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 						{{end}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index d485409d7f187..acbd0241d4a58 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -214,7 +214,7 @@
 							<div class="meta gt-my-2">
 								<span class="text light grey">
 									#{{.Index}}
-									{{$timeStr := TimeSinceUnix .GetLastEventTimestamp}}
+									{{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
 									{{if .OriginalAuthor}}
 										{{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
 									{{else if gt .Poster.ID 0}}
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 666e121f0d903..12aaa0bd71723 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -40,7 +40,7 @@
 								<div class="download gt-df gt-ac">
 									{{if $.Permission.CanRead $.UnitTypeCode}}
 										{{if .CreatedUnix}}
-											<span class="gt-mr-3">{{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix}}</span>
+											<span class="gt-mr-3">{{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix $.locale}}</span>
 										{{end}}
 										<a class="gt-mr-3 gt-mono muted" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
 										{{if not $.DisableDownloadSourceArchives}}
@@ -111,7 +111,7 @@
 									{{$.locale.Tr "repo.tagged_this"}}
 								</span>
 								{{if .CreatedUnix}}
-									<span class="time">{{TimeSinceUnix .CreatedUnix}}</span>
+									<span class="time">{{TimeSinceUnix .CreatedUnix $.locale}}</span>
 								{{end}}
 								|
 								{{end}}
@@ -133,7 +133,7 @@
 									{{$.locale.Tr "repo.released_this"}}
 								</span>
 								{{if .CreatedUnix}}
-									<span class="time">{{TimeSinceUnix .CreatedUnix}}</span>
+									<span class="time">{{TimeSinceUnix .CreatedUnix $.locale}}</span>
 								{{end}}
 								{{if not .IsDraft}}
 									| <span class="ahead"><a href="{{$.RepoLink}}/compare/{{.TagName | PathEscapeSegments}}...{{.Target | PathEscapeSegments}}">{{$.locale.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}}</a> {{$.locale.Tr "repo.release.ahead.target" .Target}}</span>
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index f5908bf9926f4..8be28ad9edba9 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -23,7 +23,7 @@
 							</span>
 						</td>
 						<td>{{FileSize .Size}}</td>
-						<td>{{TimeSince .CreatedUnix.AsTime}}</td>
+						<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
 						<td class="right aligned">
 							<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
 							<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index 6e61501241332..81cb6498374a4 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -37,7 +37,7 @@
 								{{$.locale.Tr "repo.diff.commit"}}
 								<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
 							</td>
-							<td>{{TimeSince .When}}</td>
+							<td>{{TimeSince .When $.locale}}</td>
 						</tr>
 					{{else}}
 						<tr>
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index 960ddeb7cdbd0..cfe4f6add540a 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -39,7 +39,7 @@
 									{{$.Owner.DisplayName}}
 								</a>
 							</td>
-							<td>{{TimeSince .Created}}</td>
+							<td>{{TimeSince .Created $.locale}}</td>
 							<td class="right aligned">
 								<form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST">
 									{{$.CsrfTokenHtml}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index c00cf15e03568..9540c872c2c5c 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -34,7 +34,7 @@
 					</span>
 				{{end}}
 			</th>
-			<th class="text grey right age">{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When}}{{end}}{{end}}</th>
+			<th class="text grey right age">{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When $.locale}}{{end}}{{end}}</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -87,7 +87,7 @@
 						{{end}}
 					</span>
 				</td>
-				<td class="text right age three wide">{{if $commit}}{{TimeSince $commit.Committer.When}}{{end}}</td>
+				<td class="text right age three wide">{{if $commit}}{{TimeSince $commit.Committer.When $.locale}}{{end}}</td>
 			</tr>
 		{{end}}
 	</tbody>
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl
index 171c5bab26920..c17b2dd03afd8 100644
--- a/templates/repo/wiki/pages.tmpl
+++ b/templates/repo/wiki/pages.tmpl
@@ -20,8 +20,8 @@
 							{{svg "octicon-file"}}
 							<a href="{{$.RepoLink}}/wiki/{{.SubURL}}">{{.Name}}</a>
 						</td>
-						{{$timeSince := TimeSinceUnix .UpdatedUnix}}
-						<td class="text right">{{$.locale.Tr "repo.wiki.last_updated" $timeSince | Safe}}</td>
+						{{$TimeSince := $.locale TimeSinceUnix .UpdatedUnix $.locale}}
+						<td class="text right">{{$.locale.Tr "repo.wiki.last_updated" $TimeSince | $.locale Safe}}</td>
 					</tr>
 				{{end}}
 			</tbody>
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index 94ebe3b99ae1b..d7c333c2cecbd 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -14,8 +14,8 @@
 				<a class="file-revisions-btn ui basic button" title="{{.locale.Tr "repo.wiki.back_to_wiki"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}" ><span>{{.revision}}</span> {{svg "octicon-home"}}</a>
 				{{$title}}
 				<div class="ui sub header gt-word-break">
-					{{$timeSince := TimeSince .Author.When}}
-					{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
+					{{$TimeSince := $.locale TimeSince .Author.When $.locale}}
+					{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $TimeSince | $.locale Safe}}
 				</div>
 			</div>
 		</div>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 8debc43bcbf5e..ce25e7a64a632 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -41,8 +41,8 @@
 					<a class="file-revisions-btn ui basic button" title="{{.locale.Tr "repo.wiki.file_revision"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_revision" ><span>{{.CommitCount}}</span> {{svg "octicon-history"}}</a>
 					{{$title}}
 					<div class="ui sub header">
-						{{$timeSince := TimeSince .Author.When}}
-						{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
+						{{$TimeSince := $.locale TimeSince .Author.When $.locale}}
+						{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $TimeSince | $.locale Safe}}
 					</div>
 				</div>
 				<div class="eight wide right aligned column">
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index b2b5c872c44f1..40b4924743226 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -14,7 +14,7 @@
 				</div>
 				<div class="field gt-dib gt-mr-4 disabled">
 					<label>{{.locale.Tr "actions.runners.last_online"}}</label>
-					<span>{{TimeSinceUnix .Runner.LastOnline}}</span>
+					<span>{{TimeSinceUnix .Runner.LastOnline $.locale}}</span>
 				</div>
 				<div class="field gt-dib gt-mr-4 disabled">
 					<label>{{.locale.Tr "actions.runners.agent_labels"}}</label>
@@ -76,7 +76,7 @@
 						<strong><a href="{{.GetCommitLink}}" target="_blank">{{ShortSha .CommitSHA}}</a></strong>
 					</td>
 					<td>{{if .IsStopped}}
-						<span>{{TimeSinceUnix .Stopped}}</span>
+						<span>{{TimeSinceUnix .Stopped $.locale}}</span>
 						{{else}}-{{end}}</td>
 				</tr>
 				{{end}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl
index 05022ca916f7d..d4a5b863abc29 100644
--- a/templates/shared/actions/runner_list.tmpl
+++ b/templates/shared/actions/runner_list.tmpl
@@ -70,7 +70,7 @@
 						<td class="runner-tags">
 							{{range .AllLabels}}<span class="ui label">{{.}}</span>{{end}}
 						</td>
-						<td>{{if .LastOnline}}{{TimeSinceUnix .LastOnline}}{{else}}{{$.locale.Tr "never"}}{{end}}</td>
+						<td>{{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{$.locale.Tr "never"}}{{end}}</td>
 						<td class="runner-ops">
 							{{if .Editable $.RunnerOnwerID $.RunnerRepoID}}
 							<a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a>
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
index 32c4e5c2a8158..198e76f37cbbe 100644
--- a/templates/shared/issuelist.tmpl
+++ b/templates/shared/issuelist.tmpl
@@ -52,7 +52,7 @@
 							#{{.Index}}
 						{{end}}
 					</a>
-					{{$timeStr := TimeSinceUnix .GetLastEventTimestamp}}
+					{{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
 					{{if .OriginalAuthor}}
 						{{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
 					{{else if gt .Poster.ID 0}}
diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl
index ca9ea8ababe62..1c9c07972166f 100644
--- a/templates/shared/searchbottom.tmpl
+++ b/templates/shared/searchbottom.tmpl
@@ -6,7 +6,7 @@
 		</div>
 		<div class="gt-mr-4">
 			{{if not .result.UpdatedUnix.IsZero}}
-					<span class="ui grey text">{{.root.locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix) | Safe}}</span>
+					<span class="ui grey text">{{.root.locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix $.locale) | Safe}}</span>
 			{{end}}
 		</div>
 </div>
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index 819a2765bc289..64daf4b2e7c45 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -114,7 +114,7 @@
 					<p class="text light grey">{{$.locale.Tr "action.review_dismissed_reason"}}</p>
 						<p class="text light grey">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</p>
 					{{end}}
-					<p class="text italic light grey">{{TimeSince .GetCreate}}</p>
+					<p class="text italic light grey">{{TimeSince .GetCreate $.locale}}</p>
 				</div>
 			</div>
 			<div class="ui two wide right aligned column">
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index d5f009839da03..1c379ac09d025 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -91,7 +91,7 @@
 								</div>
 							</div>
 							<div class="meta">
-								{{$closedDate:= TimeSinceUnix .ClosedDateUnix}}
+								{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
 								{{if .IsClosed}}
 									{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}}
 								{{else}}
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 6cccc8a408e23..2fea2843f6e05 100644
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -14,7 +14,7 @@
 				<div class="content">
 					<strong>{{.Name}}</strong>
 				</div>
-				<span class="time">{{TimeSinceUnix .CreatedUnix}}</span>
+				<span class="time">{{TimeSinceUnix .CreatedUnix $.locale}}</span>
 			</div>
 		{{end}}
 	</div>

From 0c313f630c14ae6dea4633951fb46f64b8549cb8 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sat, 8 Apr 2023 17:43:51 +0000
Subject: [PATCH 10/35] Undo unnecessary changes

---
 templates/admin/process-row.tmpl    | 2 +-
 templates/admin/stacktrace-row.tmpl | 2 +-
 templates/repo/branch/list.tmpl     | 2 +-
 templates/repo/diff/comments.tmpl   | 2 +-
 templates/repo/wiki/pages.tmpl      | 4 ++--
 templates/repo/wiki/revision.tmpl   | 4 ++--
 templates/repo/wiki/view.tmpl       | 4 ++--
 templates/shared/searchbottom.tmpl  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/admin/process-row.tmpl b/templates/admin/process-row.tmpl
index 79ffa44900c18..477bf5a41ea1a 100644
--- a/templates/admin/process-row.tmpl
+++ b/templates/admin/process-row.tmpl
@@ -3,7 +3,7 @@
 		<div class="icon gt-ml-3 gt-mr-3">{{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}}</div>
 		<div class="content gt-f1">
 			<div class="header">{{.Process.Description}}</div>
-			<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start $.locale}}</span></div>
+			<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span></div>
 		</div>
 		<div>
 			{{if ne .Process.Type "system"}}
diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl
index 6fef98ae6fff3..e6d2e68cbb6fb 100644
--- a/templates/admin/stacktrace-row.tmpl
+++ b/templates/admin/stacktrace-row.tmpl
@@ -13,7 +13,7 @@
 		</div>
 		<div class="content gt-f1">
 			<div class="header">{{.Process.Description}}</div>
-			<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start $.locale}}</span>{{end}}</div>
+			<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span>{{end}}</div>
 		</div>
 		<div>
 			{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 1f491cedb1ce7..6dd6aecb37f6f 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -18,7 +18,7 @@
 									{{svg "octicon-shield-lock"}}
 								{{end}}
 								<a href="{{.RepoLink}}/src/branch/{{PathEscapeSegments .DefaultBranch}}">{{.DefaultBranch}}</a>
-								<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.Commit.ID.String}}">{{ShortSha .DefaultBranchBranch.Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}}</span> · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.Commit.Committer.When $.locale}}</p>
+								<p class="info gt-df gt-ac gt-my-2">{{svg "octicon-git-commit" 16 "gt-mr-2"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.Commit.ID.String}}">{{ShortSha .DefaultBranchBranch.Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}}</span> · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.Commit.Committer.When .locale}}</p>
 							</td>
 							<td class="right aligned overflow-visible">
 								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 12a5fa8fa0ad8..6428e5a376294 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -1,6 +1,6 @@
 {{range .comments}}
 
-{{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
+{{$createdStr:= TimeSinceUnix .CreatedUnix .root.locale}}
 <div class="comment" id="{{.HashTag}}">
 	{{if .OriginalAuthor}}
 		<span class="avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl
index c17b2dd03afd8..743574d0a5c72 100644
--- a/templates/repo/wiki/pages.tmpl
+++ b/templates/repo/wiki/pages.tmpl
@@ -20,8 +20,8 @@
 							{{svg "octicon-file"}}
 							<a href="{{$.RepoLink}}/wiki/{{.SubURL}}">{{.Name}}</a>
 						</td>
-						{{$TimeSince := $.locale TimeSinceUnix .UpdatedUnix $.locale}}
-						<td class="text right">{{$.locale.Tr "repo.wiki.last_updated" $TimeSince | $.locale Safe}}</td>
+						{{$timeSince := TimeSinceUnix .UpdatedUnix $.locale}}
+						<td class="text right">{{$.locale.Tr "repo.wiki.last_updated" $timeSince | Safe}}</td>
 					</tr>
 				{{end}}
 			</tbody>
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index d7c333c2cecbd..0f540fbaa566c 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -14,8 +14,8 @@
 				<a class="file-revisions-btn ui basic button" title="{{.locale.Tr "repo.wiki.back_to_wiki"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}" ><span>{{.revision}}</span> {{svg "octicon-home"}}</a>
 				{{$title}}
 				<div class="ui sub header gt-word-break">
-					{{$TimeSince := $.locale TimeSince .Author.When $.locale}}
-					{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $TimeSince | $.locale Safe}}
+					{{$timeSince := TimeSince .Author.When $.locale}}
+					{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
 				</div>
 			</div>
 		</div>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index ce25e7a64a632..a1d1c047515be 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -41,8 +41,8 @@
 					<a class="file-revisions-btn ui basic button" title="{{.locale.Tr "repo.wiki.file_revision"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_revision" ><span>{{.CommitCount}}</span> {{svg "octicon-history"}}</a>
 					{{$title}}
 					<div class="ui sub header">
-						{{$TimeSince := $.locale TimeSince .Author.When $.locale}}
-						{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $TimeSince | $.locale Safe}}
+						{{$timeSince := TimeSince .Author.When $.locale}}
+						{{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
 					</div>
 				</div>
 				<div class="eight wide right aligned column">
diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl
index 1c9c07972166f..cce82721cd094 100644
--- a/templates/shared/searchbottom.tmpl
+++ b/templates/shared/searchbottom.tmpl
@@ -6,7 +6,7 @@
 		</div>
 		<div class="gt-mr-4">
 			{{if not .result.UpdatedUnix.IsZero}}
-					<span class="ui grey text">{{.root.locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix $.locale) | Safe}}</span>
+					<span class="ui grey text">{{.root.locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix .root.locale) | Safe}}</span>
 			{{end}}
 		</div>
 </div>

From fc81d1b2164209677ecad89e58066459dc1ad832 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sun, 9 Apr 2023 07:31:33 +0000
Subject: [PATCH 11/35] Fix missed undo of find-and-replace

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 templates/repo/diff/comments.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 6428e5a376294..5bcaeeb463796 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -1,6 +1,6 @@
 {{range .comments}}
 
-{{$createdStr:= TimeSinceUnix .CreatedUnix .root.locale}}
+{{$createdStr:= TimeSinceUnix .CreatedUnix $.root.locale}}
 <div class="comment" id="{{.HashTag}}">
 	{{if .OriginalAuthor}}
 		<span class="avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>

From faee6f003cc47589687c75c1de0f2a89d9247cb3 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sun, 9 Apr 2023 19:13:06 +0000
Subject: [PATCH 12/35] Use `RFC3339`

---
 modules/timeutil/since.go      | 2 +-
 routers/web/admin/admin.go     | 2 +-
 tests/integration/repo_test.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 192b2ff4d73ae..5c37dd4c4780a 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -116,7 +116,7 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(then time.Time, lang translation.Locale) template.HTML {
-	timestamp := then.Format("2006-01-02 15:04:05 -07:00")
+	timestamp := then.Format(time.RFC3339)
 	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s">%s</relative-time>`, lang.Tr("packages.versions.on"), timestamp, timestamp))
 }
 
diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go
index 086aab14ac545..9847a6d9236f6 100644
--- a/routers/web/admin/admin.go
+++ b/routers/web/admin/admin.go
@@ -73,7 +73,7 @@ var sysStatus struct {
 }
 
 func updateSystemStatus() {
-	sysStatus.StartTime = setting.AppStartTime.Format("2006-01-02 15:04:05 -07:00")
+	sysStatus.StartTime = setting.AppStartTime.Format(time.RFC3339)
 
 	m := new(runtime.MemStats)
 	runtime.ReadMemStats(m)
diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index c7ddec321b7ae..5ddedfcf3601e 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -77,7 +77,7 @@ func testViewRepo(t *testing.T) {
 
 		// convert "2017-06-14 21:54:21 +0800" to "Wed, 14 Jun 2017 13:54:21 UTC"
 		htmlTimeString, _ := s.Find("relative-time.time-since").Attr("datetime")
-		htmlTime, _ := time.Parse("2006-01-02 15:04:05 -07:00", htmlTimeString)
+		htmlTime, _ := time.Parse(time.RFC3339, htmlTimeString)
 		f.commitTime = htmlTime.UTC().Format("Mon, 02 Jan 2006 15:04:05 UTC")
 		items = append(items, f)
 	})

From 7aaee69288338a882899eff54f749fd376133057 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sun, 9 Apr 2023 20:14:37 +0000
Subject: [PATCH 13/35] Allow interactive tooltips, disable the `title`

---
 modules/timeutil/since.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 5c37dd4c4780a..2cf4e4397d5cc 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/translation"
 )
 
@@ -117,7 +118,9 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(then time.Time, lang translation.Locale) template.HTML {
 	timestamp := then.Format(time.RFC3339)
-	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s">%s</relative-time>`, lang.Tr("packages.versions.on"), timestamp, timestamp))
+	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" title="" data-tooltip-content="%s" data-tooltip-interactive="true" prefix="%s" datetime="%s">%s</relative-time>`,
+		then.In(setting.DefaultUILocation).Format(GetTimeFormat(lang.Language())),
+		lang.Tr("packages.versions.on"), timestamp, timestamp))
 }
 
 // TimeSinceUnix calculates the time interval and generate user-friendly string.

From 98e89a0344288d109b7d07c7326168f714c28573 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 9 Apr 2023 22:32:31 +0200
Subject: [PATCH 14/35] Revert "Allow interactive tooltips, disable the
 `title`"

This reverts commit 7aaee69288338a882899eff54f749fd376133057.
---
 modules/timeutil/since.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 2cf4e4397d5cc..5c37dd4c4780a 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/translation"
 )
 
@@ -118,9 +117,7 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(then time.Time, lang translation.Locale) template.HTML {
 	timestamp := then.Format(time.RFC3339)
-	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" title="" data-tooltip-content="%s" data-tooltip-interactive="true" prefix="%s" datetime="%s">%s</relative-time>`,
-		then.In(setting.DefaultUILocation).Format(GetTimeFormat(lang.Language())),
-		lang.Tr("packages.versions.on"), timestamp, timestamp))
+	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s">%s</relative-time>`, lang.Tr("packages.versions.on"), timestamp, timestamp))
 }
 
 // TimeSinceUnix calculates the time interval and generate user-friendly string.

From 1b34f56566b65ca0557aa3c358d1aa12527c0e88 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 9 Apr 2023 23:08:54 +0200
Subject: [PATCH 15/35] add tooltip swap and add it to mutation observer

---
 web_src/js/modules/tippy.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index 0d57af4f0f645..81bb48fddea61 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -86,6 +86,17 @@ function attachChildrenLazyTooltip(target) {
   }
 }
 
+// on <relative-time> elements, swap title for data-tooltip-content this
+// only runs once, so is only suitable for content that does not change.
+function swapTitleForTooltip(el) {
+  if (el.hasAttribute('data-tooltip-content')) return;
+  el.setAttribute('data-tooltip-content', el.getAttribute('title'));
+  el.setAttribute('data-tooltip-interactive', 'true');
+  el.setAttribute('title', '');
+}
+
+const elementNodeTypes = new Set([Node.ELEMENT_NODE, Node.DOCUMENT_FRAGMENT_NODE]);
+
 export function initGlobalTooltips() {
   // use MutationObserver to detect new elements added to the DOM, or attributes changed
   const observer = new MutationObserver((mutationList) => {
@@ -93,8 +104,10 @@ export function initGlobalTooltips() {
       if (mutation.type === 'childList') {
         // mainly for Vue components and AJAX rendered elements
         for (const el of mutation.addedNodes) {
-          // handle all "tooltip" elements in added nodes which have 'querySelectorAll' method, skip non-related nodes (eg: "#text")
-          if ('querySelectorAll' in el) {
+          if (el.nodeName === 'RELATIVE-TIME') {
+            swapTitleForTooltip(el);
+          }
+          if (elementNodeTypes.has(el.nodeType)) {
             attachChildrenLazyTooltip(el);
           }
         }
@@ -110,7 +123,13 @@ export function initGlobalTooltips() {
     attributeFilter: ['data-tooltip-content'],
   });
 
+  // init tooltips
   attachChildrenLazyTooltip(document.documentElement);
+
+  // init time elements
+  for (const el of document.querySelectorAll('relative-time')) {
+    swapTitleForTooltip(el);
+  }
 }
 
 export function showTemporaryTooltip(target, content) {

From e72bdf79b7c8108a19f5dca10268871c44b4ffca Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 9 Apr 2023 23:13:24 +0200
Subject: [PATCH 16/35] tweak comment

---
 web_src/js/modules/tippy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index 81bb48fddea61..f7a3f03d59150 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -86,7 +86,7 @@ function attachChildrenLazyTooltip(target) {
   }
 }
 
-// on <relative-time> elements, swap title for data-tooltip-content this
+// on <relative-time> elements, swap `title` for `data-tooltip-content`. This
 // only runs once, so is only suitable for content that does not change.
 function swapTitleForTooltip(el) {
   if (el.hasAttribute('data-tooltip-content')) return;

From 8976d335125092ec0a3c09ced11e9e5140fca4b9 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 9 Apr 2023 23:31:10 +0200
Subject: [PATCH 17/35] filter for .time-since

---
 web_src/js/modules/tippy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index f7a3f03d59150..244b900519889 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -104,7 +104,7 @@ export function initGlobalTooltips() {
       if (mutation.type === 'childList') {
         // mainly for Vue components and AJAX rendered elements
         for (const el of mutation.addedNodes) {
-          if (el.nodeName === 'RELATIVE-TIME') {
+          if (el.nodeName === 'RELATIVE-TIME' && el.classList.contains('time-since')) {
             swapTitleForTooltip(el);
           }
           if (elementNodeTypes.has(el.nodeType)) {
@@ -127,7 +127,7 @@ export function initGlobalTooltips() {
   attachChildrenLazyTooltip(document.documentElement);
 
   // init time elements
-  for (const el of document.querySelectorAll('relative-time')) {
+  for (const el of document.querySelectorAll('relative-time.time-since')) {
     swapTitleForTooltip(el);
   }
 }

From da185ae62de1e082699cf069a5efaf8fbc26431e Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Mon, 10 Apr 2023 10:43:44 +0800
Subject: [PATCH 18/35] general title => tippy tooltip switching

---
 modules/timeutil/since.go   |  3 ++-
 web_src/js/modules/tippy.js | 47 +++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 5c37dd4c4780a..523603675ace9 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -117,7 +117,8 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(then time.Time, lang translation.Locale) template.HTML {
 	timestamp := then.Format(time.RFC3339)
-	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s">%s</relative-time>`, lang.Tr("packages.versions.on"), timestamp, timestamp))
+	// declare data-tooltip-content attribute to switch from "title" tooltip to "tippy" tooltip
+	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s" data-tooltip-content data-tooltip-interactive="true">%s</relative-time>`, lang.Tr("packages.versions.on"), timestamp, timestamp))
 }
 
 // TimeSinceUnix calculates the time interval and generate user-friendly string.
diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index 244b900519889..0fa12fc0d379c 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -36,6 +36,8 @@ export function createTippy(target, opts = {}) {
  * @returns {null|tippy}
  */
 function attachTooltip(target, content = null) {
+  switchTitleToTooltip(target);
+
   content = content ?? target.getAttribute('data-tooltip-content');
   if (!content) return null;
 
@@ -55,6 +57,15 @@ function attachTooltip(target, content = null) {
   return target._tippy;
 }
 
+function switchTitleToTooltip(target) {
+  const title = target.getAttribute('title');
+  if (title) {
+    target.setAttribute('data-tooltip-content', title);
+    target.setAttribute('aria-label', title);
+    target.setAttribute('title', '');
+  }
+}
+
 /**
  * Creating tooltip tippy instance is expensive, so we only create it when the user hovers over the element
  * According to https://www.w3.org/TR/DOM-Level-3-Events/#events-mouseevent-event-order , mouseover event is fired before mouseenter event
@@ -86,50 +97,34 @@ function attachChildrenLazyTooltip(target) {
   }
 }
 
-// on <relative-time> elements, swap `title` for `data-tooltip-content`. This
-// only runs once, so is only suitable for content that does not change.
-function swapTitleForTooltip(el) {
-  if (el.hasAttribute('data-tooltip-content')) return;
-  el.setAttribute('data-tooltip-content', el.getAttribute('title'));
-  el.setAttribute('data-tooltip-interactive', 'true');
-  el.setAttribute('title', '');
-}
-
 const elementNodeTypes = new Set([Node.ELEMENT_NODE, Node.DOCUMENT_FRAGMENT_NODE]);
 
 export function initGlobalTooltips() {
-  // use MutationObserver to detect new elements added to the DOM, or attributes changed
-  const observer = new MutationObserver((mutationList) => {
+  // use MutationObserver to detect new "data-tooltip-content" elements added to the DOM, or attributes changed
+  const observerConnect = (observer) => observer.observe(document, {
+    subtree: true,
+    childList: true,
+    attributeFilter: ['data-tooltip-content', 'title']
+  });
+  const observer = new MutationObserver((mutationList, observer) => {
+    observer.disconnect();
     for (const mutation of mutationList) {
       if (mutation.type === 'childList') {
         // mainly for Vue components and AJAX rendered elements
         for (const el of mutation.addedNodes) {
-          if (el.nodeName === 'RELATIVE-TIME' && el.classList.contains('time-since')) {
-            swapTitleForTooltip(el);
-          }
           if (elementNodeTypes.has(el.nodeType)) {
             attachChildrenLazyTooltip(el);
           }
         }
       } else if (mutation.type === 'attributes') {
-        // sync the tooltip content if the attributes change
         attachTooltip(mutation.target);
       }
     }
+    observerConnect(observer);
   });
-  observer.observe(document, {
-    subtree: true,
-    childList: true,
-    attributeFilter: ['data-tooltip-content'],
-  });
+  observerConnect(observer);
 
-  // init tooltips
   attachChildrenLazyTooltip(document.documentElement);
-
-  // init time elements
-  for (const el of document.querySelectorAll('relative-time.time-since')) {
-    swapTitleForTooltip(el);
-  }
 }
 
 export function showTemporaryTooltip(target, content) {

From 722967b33ebc3749c4f96ba5f7ddd58a1616a31f Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Mon, 10 Apr 2023 10:10:44 +0200
Subject: [PATCH 19/35] send UTC only to browsers

---
 modules/timeutil/since.go     | 8 ++++----
 modules/timeutil/timestamp.go | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 523603675ace9..4e6f71126f6cd 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -114,14 +114,14 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 	return strings.TrimPrefix(timeStr, ", ")
 }
 
-// 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 {
-	timestamp := then.Format(time.RFC3339)
+	timestamp := then.UTC().Format(time.RFC3339)
 	// declare data-tooltip-content attribute to switch from "title" tooltip to "tippy" tooltip
 	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s" data-tooltip-content data-tooltip-interactive="true">%s</relative-time>`, lang.Tr("packages.versions.on"), timestamp, timestamp))
 }
 
-// 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 TimeSince(then.AsTime(), lang)
+	return TimeSince(then.AsLocalTime(), lang)
 }
diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go
index c8e0d4bdc114a..657eff9022010 100644
--- a/modules/timeutil/timestamp.go
+++ b/modules/timeutil/timestamp.go
@@ -65,8 +65,7 @@ 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
+	return time.Unix(int64(ts), 0).In(loc)
 }
 
 // AsTimePtr convert timestamp as *time.Time in Local locale

From d6e28d649e3c160ccf80cd37ac263556afb9e6ab Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Mon, 10 Apr 2023 17:00:01 +0800
Subject: [PATCH 20/35] handle newly added tooltip element itself

---
 web_src/js/modules/tippy.js | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index 0fa12fc0d379c..c971311819a18 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -78,25 +78,27 @@ function lazyTooltipOnMouseHover(e) {
   attachTooltip(this);
 }
 
-/**
- * Activate the tooltip for all children elements
- * And if the element has no aria-label, use the tooltip content as aria-label
- * @param target {HTMLElement}
- */
-function attachChildrenLazyTooltip(target) {
-  for (const el of target.querySelectorAll('[data-tooltip-content]')) {
-    el.addEventListener('mouseover', lazyTooltipOnMouseHover, true);
+// Activate the tooltip for current element.
+// If the element has no aria-label, use the tooltip content as aria-label.
+function attachLazyTooltip(el) {
+  el.addEventListener('mouseover', lazyTooltipOnMouseHover, true);
 
-    // meanwhile, if the element has no aria-label, use the tooltip content as aria-label
-    if (!el.hasAttribute('aria-label')) {
-      const content = target.getAttribute('data-tooltip-content');
-      if (content) {
-        el.setAttribute('aria-label', content);
-      }
+  // meanwhile, if the element has no aria-label, use the tooltip content as aria-label
+  if (!el.hasAttribute('aria-label')) {
+    const content = el.getAttribute('data-tooltip-content');
+    if (content) {
+      el.setAttribute('aria-label', content);
     }
   }
 }
 
+// Activate the tooltip for all children elements.
+function attachChildrenLazyTooltip(target) {
+  for (const el of target.querySelectorAll('[data-tooltip-content]')) {
+    attachLazyTooltip(el);
+  }
+}
+
 const elementNodeTypes = new Set([Node.ELEMENT_NODE, Node.DOCUMENT_FRAGMENT_NODE]);
 
 export function initGlobalTooltips() {
@@ -114,6 +116,7 @@ export function initGlobalTooltips() {
         for (const el of mutation.addedNodes) {
           if (elementNodeTypes.has(el.nodeType)) {
             attachChildrenLazyTooltip(el);
+            if (el.hasAttribute('data-tooltip-content')) attachLazyTooltip(el);
           }
         }
       } else if (mutation.type === 'attributes') {

From ec57cddca0b55f131d0f27c6768f9fdfb52bd734 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Mon, 10 Apr 2023 17:32:25 +0800
Subject: [PATCH 21/35] Update web_src/js/modules/tippy.js

Co-authored-by: silverwind <me@silverwind.io>
---
 web_src/js/modules/tippy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index c971311819a18..a2277e3417482 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -81,7 +81,7 @@ function lazyTooltipOnMouseHover(e) {
 // Activate the tooltip for current element.
 // If the element has no aria-label, use the tooltip content as aria-label.
 function attachLazyTooltip(el) {
-  el.addEventListener('mouseover', lazyTooltipOnMouseHover, true);
+  el.addEventListener('mouseover', lazyTooltipOnMouseHover, {capture: true});
 
   // meanwhile, if the element has no aria-label, use the tooltip content as aria-label
   if (!el.hasAttribute('aria-label')) {

From db92c16cc851e39805b5c2f7fd3b1e0ca3ea31eb Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Mon, 10 Apr 2023 18:14:21 +0800
Subject: [PATCH 22/35] explain why the title attribute is kept

---
 web_src/js/modules/tippy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index a2277e3417482..5aa375f0c643d 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -62,7 +62,7 @@ function switchTitleToTooltip(target) {
   if (title) {
     target.setAttribute('data-tooltip-content', title);
     target.setAttribute('aria-label', title);
-    target.setAttribute('title', '');
+    target.setAttribute('title', ''); // keep the attribute, in case there are some other "[title]" selectors.
   }
 }
 

From 89b0f029c2781f2d3e4d4cbb462a802da011cdae Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 13:16:50 +0300
Subject: [PATCH 23/35] Update templates/admin/org/list.tmpl

Co-authored-by: delvh <dev.lh@web.de>
---
 templates/admin/org/list.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 040a7b314ff76..f114b90fc7b5b 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -44,7 +44,7 @@
 							<td>{{.NumTeams}}</td>
 							<td>{{.NumMembers}}</td>
 							<td>{{.NumRepos}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span></td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
 							<td><a href="{{.OrganisationLink}}/settings">{{svg "octicon-pencil"}}</a></td>
 						</tr>
 					{{end}}

From 8969ba89db85a9fa67be3ab5167da9ee46a044e1 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 13:17:02 +0300
Subject: [PATCH 24/35] Update
 templates/package/shared/cleanup_rules/preview.tmpl

Co-authored-by: delvh <dev.lh@web.de>
---
 templates/package/shared/cleanup_rules/preview.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/package/shared/cleanup_rules/preview.tmpl b/templates/package/shared/cleanup_rules/preview.tmpl
index 745a6dd4f2a95..f9c9bc71f0843 100644
--- a/templates/package/shared/cleanup_rules/preview.tmpl
+++ b/templates/package/shared/cleanup_rules/preview.tmpl
@@ -22,7 +22,7 @@
 					<td><a href="{{.FullWebLink}}">{{.Version.Version}}</a></td>
 					<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
 					<td>{{FileSize .CalculateBlobSize}}</td>
-					<td><span title="{{.Version.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</span></td>
+					<td>{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</td>
 				</tr>
 			{{else}}
 				<tr>

From 617add3d1e1987abcb6ad67746cdc93dd3a242e4 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 13:17:15 +0300
Subject: [PATCH 25/35] Update templates/admin/user/list.tmpl

Co-authored-by: delvh <dev.lh@web.de>
---
 templates/admin/user/list.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index dcc68ffc0b075..11188c58f9eac 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -94,7 +94,7 @@
 							<td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{.NumRepos}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span></td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
 							{{if .LastLoginUnix}}
 								<td><span title="{{.LastLoginUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</span></td>
 							{{else}}

From d6515348ace0a3b7645a5c5fde80ab9890509502 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 13:17:32 +0300
Subject: [PATCH 26/35] Update templates/admin/packages/list.tmpl

Co-authored-by: delvh <dev.lh@web.de>
---
 templates/admin/packages/list.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index cc8f10750edbc..121f575861d99 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -68,7 +68,7 @@
 							{{end}}
 							</td>
 							<td>{{FileSize .CalculateBlobSize}}</td>
-							<td><span title="{{.Version.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</span></td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</td>
 							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
 						</tr>
 					{{end}}

From e03f3169f04a956b293b051f8529331e37bbca64 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 13:17:46 +0300
Subject: [PATCH 27/35] Update templates/admin/user/list.tmpl

Co-authored-by: delvh <dev.lh@web.de>
---
 templates/admin/user/list.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 11188c58f9eac..50b9d136190e3 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -96,7 +96,7 @@
 							<td>{{.NumRepos}}</td>
 							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
 							{{if .LastLoginUnix}}
-								<td><span title="{{.LastLoginUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</span></td>
+								<td>{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</td>
 							{{else}}
 								<td><span>{{$.locale.Tr "admin.users.never_login"}}</span></td>
 							{{end}}

From 17d883fcbfcb64187dce706677af2bbea6e1a933 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 13:17:57 +0300
Subject: [PATCH 28/35] Update templates/admin/repo/list.tmpl

Co-authored-by: delvh <dev.lh@web.de>
---
 templates/admin/repo/list.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 6ad65a59589f1..f8e2bbc8444ef 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -83,7 +83,7 @@
 							<td>{{.NumForks}}</td>
 							<td>{{.NumIssues}}</td>
 							<td>{{FileSize .Size}}</td>
-							<td><span title="{{.CreatedUnix.FormatLong}}">{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span></td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
 							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
 						</tr>
 					{{end}}

From 12cecdf30042350d2109974895c1d3f290e8ce1f Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 10:18:49 +0000
Subject: [PATCH 29/35]  Drop unnecessary `title` from process-row

---
 templates/admin/process-row.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
 		<div class="icon gt-ml-3 gt-mr-3">{{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}}</div>
 		<div class="content gt-f1">
 			<div class="header">{{.Process.Description}}</div>
-			<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span></div>
+			<div class="description">{{TimeSince .Process.Start .root.locale}}</div>
 		</div>
 		<div>
 			{{if ne .Process.Type "system"}}

From fde6c38591f5d4a58bd295284099a2c3ea05fc13 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 13:35:14 +0300
Subject: [PATCH 30/35] Update modules/timeutil/timestamp.go

Co-authored-by: delvh <dev.lh@web.de>
---
 modules/timeutil/timestamp.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go
index 657eff9022010..c60d287faee13 100644
--- a/modules/timeutil/timestamp.go
+++ b/modules/timeutil/timestamp.go
@@ -64,7 +64,7 @@ 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) {
+func (ts TimeStamp) AsTimeInLocation(loc *time.Location) time.Time {
 	return time.Unix(int64(ts), 0).In(loc)
 }
 

From 460fe71429eeeb64c29d0ab9da4f15186dd955fd Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 11:05:26 +0000
Subject: [PATCH 31/35] Found more dates

---
 modules/templates/helper.go         | 2 +-
 templates/admin/cron.tmpl           | 4 ++--
 templates/admin/queue.tmpl          | 4 ++--
 templates/admin/stacktrace-row.tmpl | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

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/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 @@
 						<td><button type="submit" class="ui green button" name="op" value="{{.Name}}" title="{{$.locale.Tr "admin.dashboard.operation_run"}}">{{svg "octicon-triangle-right"}}</button></td>
 						<td>{{$.locale.Tr (printf "admin.dashboard.%s" .Name)}}</td>
 						<td>{{.Spec}}</td>
-						<td>{{DateFmtLong .Next}}</td>
-						<td>{{if gt .Prev.Year 1}}{{DateFmtLong .Prev}}{{else}}N/A{{end}}</td>
+						<td>{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Next) "Fallback" (DateFmtLong .Next) )}}</td>
+						<td>{{if gt .Prev.Year 1}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Prev) "Fallback" (DateFmtLong .Prev) )}}{{else}}N/A{{end}}</td>
 						<td>{{.ExecTimes}}</td>
 						<td {{if ne .Status ""}}data-tooltip-content="{{.FormatLastMessage $.locale}}"{{end}} >{{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}}</td>
 					</tr>
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}}
 					<tr>
 						<td>{{.Workers}}{{if .IsFlusher}}<span title="{{$.locale.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
-						<td>{{DateFmtLong .Start}}</td>
-						<td>{{if .HasTimeout}}{{DateFmtLong .Timeout}}{{else}}-{{end}}</td>
+						<td>{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Start) "Fallback" (DateFmtLong .Start) )}}</td>
+						<td>{{if .HasTimeout}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Timeout) "Fallback" (DateFmtLong .Timeout) )}}{{else}}-{{end}}</td>
 						<td>
 							<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}" title="{{$.locale.Tr "remove"}}">{{svg "octicon-trash"}}</a>
 						</td>
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 @@
 		</div>
 		<div class="content gt-f1">
 			<div class="header">{{.Process.Description}}</div>
-			<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span>{{end}}</div>
+			<div class="description">{{if ne .Process.Type "none"}}{{TimeSince .Process.Start .root.locale}}{{end}}</div>
 		</div>
 		<div>
 			{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}}

From b7064ed480ec3cd4978a66ca151be3b66f4e1b4d Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 10 Apr 2023 11:23:10 +0000
Subject: [PATCH 32/35] Localize notice

---
 templates/admin/notice.tmpl         | 2 +-
 web_src/js/features/admin/common.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index d236396dac38f..dd17bde036ad3 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -29,7 +29,7 @@
 							<td>{{.ID}}</td>
 							<td>{{$.locale.Tr .TrStr}}</td>
 							<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
-							<td><span class="notice-created-time">{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span></td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
 							<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
 						</tr>
 					{{end}}
diff --git a/web_src/js/features/admin/common.js b/web_src/js/features/admin/common.js
index be5aa876a5dba..8f895152c77b0 100644
--- a/web_src/js/features/admin/common.js
+++ b/web_src/js/features/admin/common.js
@@ -178,7 +178,7 @@ export function initAdminCommon() {
     // Attach view detail modals
     $('.view-detail').on('click', function () {
       $detailModal.find('.content pre').text($(this).parents('tr').find('.notice-description').text());
-      $detailModal.find('.sub.header').text($(this).parents('tr').find('.notice-created-time').text());
+      $detailModal.find('.sub.header').text($(this).parents('tr').find('relative-time').attr('title'));
       $detailModal.modal('show');
       return false;
     });

From e81c5cd93f12b531eaa23e29baa1cf5896a99051 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Mon, 10 Apr 2023 13:34:23 +0200
Subject: [PATCH 33/35] add on_date

---
 modules/timeutil/since.go       | 2 +-
 options/locale/locale_en-US.ini | 3 ++-
 templates/package/view.tmpl     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index 4e6f71126f6cd..bdde54c617540 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -118,7 +118,7 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 func TimeSince(then time.Time, lang translation.Locale) template.HTML {
 	timestamp := then.UTC().Format(time.RFC3339)
 	// declare data-tooltip-content attribute to switch from "title" tooltip to "tippy" tooltip
-	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s" data-tooltip-content data-tooltip-interactive="true">%s</relative-time>`, lang.Tr("packages.versions.on"), timestamp, timestamp))
+	return template.HTML(fmt.Sprintf(`<relative-time class="time-since" prefix="%s" datetime="%s" data-tooltip-content data-tooltip-interactive="true">%s</relative-time>`, lang.Tr("on_date"), timestamp, timestamp))
 }
 
 // TimeSinceUnix renders relative time HTML given a TimeStamp
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index eb1ffebc37714..f2d6e3c2ee9fc 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
@@ -3188,7 +3190,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/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}}
 								<div class="item">
 									<a href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
-									<span class="text small">{{$.locale.Tr "packages.versions.on"}} {{.CreatedUnix.FormatDate}}</span>
+									<span class="text small">{{$.locale.Tr "on_date"}} {{.CreatedUnix.FormatDate}}</span>
 								</div>
 							{{end}}
 							</div>

From 113e2d5acf75b775475e12efcde3146e3ce3cf63 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Mon, 10 Apr 2023 21:02:38 +0800
Subject: [PATCH 34/35] take pending mutations when disconnect

---
 web_src/js/modules/tippy.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index 5aa375f0c643d..7b5865e0957fb 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -109,8 +109,9 @@ export function initGlobalTooltips() {
     attributeFilter: ['data-tooltip-content', 'title']
   });
   const observer = new MutationObserver((mutationList, observer) => {
+    const pending = observer.takeRecords();
     observer.disconnect();
-    for (const mutation of mutationList) {
+    for (const mutation of [...mutationList, ...pending]) {
       if (mutation.type === 'childList') {
         // mainly for Vue components and AJAX rendered elements
         for (const el of mutation.addedNodes) {

From 7e27112c7ce4303e36c04dda762d2780585afba8 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Mon, 10 Apr 2023 15:13:04 +0200
Subject: [PATCH 35/35] update comment, tweak interactiveBorder to prevent some
 double tooltips

---
 web_src/js/modules/tippy.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index 7b5865e0957fb..6cec95d7661a5 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -6,7 +6,7 @@ export function createTippy(target, opts = {}) {
     animation: false,
     allowHTML: false,
     hideOnClick: false,
-    interactiveBorder: 30,
+    interactiveBorder: 20,
     ignoreAttributes: true,
     maxWidth: 500, // increase over default 350px
     arrow: `<svg width="16" height="7"><path d="m0 7 8-7 8 7Z" class="tippy-svg-arrow-outer"/><path d="m0 8 8-7 8 7Z" class="tippy-svg-arrow-inner"/></svg>`,
@@ -62,7 +62,10 @@ function switchTitleToTooltip(target) {
   if (title) {
     target.setAttribute('data-tooltip-content', title);
     target.setAttribute('aria-label', title);
-    target.setAttribute('title', ''); // keep the attribute, in case there are some other "[title]" selectors.
+    // keep the attribute, in case there are some other "[title]" selectors
+    // and to prevent infinite loop with <relative-time> which will re-add
+    // title if it is absent
+    target.setAttribute('title', '');
   }
 }
 
@@ -117,7 +120,9 @@ export function initGlobalTooltips() {
         for (const el of mutation.addedNodes) {
           if (elementNodeTypes.has(el.nodeType)) {
             attachChildrenLazyTooltip(el);
-            if (el.hasAttribute('data-tooltip-content')) attachLazyTooltip(el);
+            if (el.hasAttribute('data-tooltip-content')) {
+              attachLazyTooltip(el);
+            }
           }
         }
       } else if (mutation.type === 'attributes') {