From 569b131de0b27e29f80b6aa786ba48f08813a388 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Wed, 26 Apr 2023 21:15:16 +0000 Subject: [PATCH 1/9] Change to "Force absolute timestamps" and add to the user's appearance setting Signed-off-by: Yarden Shoham --- models/user/setting_keys.go | 2 ++ modules/timeutil/since.go | 3 +++ options/locale/locale_en-US.ini | 3 +++ routers/web/user/setting/profile.go | 22 ++++++++++++++++++++++ routers/web/web.go | 1 + services/forms/user_form.go | 5 +++++ services/forms/user_form_timestamps.go | 14 ++++++++++++++ templates/user/settings/appearance.tmpl | 19 +++++++++++++++++++ 8 files changed, 69 insertions(+) create mode 100644 services/forms/user_form_timestamps.go diff --git a/models/user/setting_keys.go b/models/user/setting_keys.go index 10255735b3177..40f815a51cd3f 100644 --- a/models/user/setting_keys.go +++ b/models/user/setting_keys.go @@ -12,4 +12,6 @@ const ( UserActivityPubPrivPem = "activitypub.priv_pem" // UserActivityPubPubPem is user's public key UserActivityPubPubPem = "activitypub.pub_pem" + // SettingsForceAbsoluteTimestamps is the setting key for hidden comment types + SettingsForceAbsoluteTimestamps = "timestamps.force_absolute" ) diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index 04fcff54a3384..8c835d87f8a3a 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -132,6 +132,9 @@ func timeSinceUnix(then, now time.Time, lang translation.Locale) template.HTML { // TimeSince renders relative time HTML given a time.Time func TimeSince(then time.Time, lang translation.Locale) template.HTML { + // if user forces absolute timestamps, use the full time + // (how can I get the context here? I want to run `user_model.GetUserSetting(ctx.Doer.ID, user_model.SettingsForceAbsoluteTimestamps)`) + // return DateTime("full", then) return timeSinceUnix(then, time.Now(), lang) } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 54e041d7854a8..0be572ff9b0fb 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -640,6 +640,9 @@ saved_successfully = Your settings were saved successfully. privacy = Privacy keep_activity_private = Hide the activity from the profile page keep_activity_private_popup = Makes the activity visible only for you and the admins +timestamps = Timestamps +force_absolute_timestamps = Force absolute timestamps +force_absolute_timestamps_popup = Always render all timestamps as dates, do not allow relative form (e.g. 5 days ago) lookup_avatar_by_mail = Look Up Avatar by Email Address federated_avatar_lookup = Federated Avatar Lookup diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 0a8a5e6280c46..8bc25883b33a0 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -12,6 +12,7 @@ import ( "net/http" "os" "path/filepath" + "strconv" "strings" "code.gitea.io/gitea/models/db" @@ -350,6 +351,14 @@ func Appearance(ctx *context.Context) { return forms.IsUserHiddenCommentTypeGroupChecked(commentTypeGroup, hiddenCommentTypes) } + val, err = user_model.GetUserSetting(ctx.Doer.ID, user_model.SettingsForceAbsoluteTimestamps) + if err != nil { + ctx.ServerError("GetUserSetting", err) + return + } + forceAbsoluteTimestamps, _ := strconv.ParseBool(val) // we can safely ignore the failed conversion here + ctx.Data["ForceAbsoluteTimestamps"] = forceAbsoluteTimestamps + ctx.HTML(http.StatusOK, tplSettingsAppearance) } @@ -421,3 +430,16 @@ func UpdateUserHiddenComments(ctx *context.Context) { ctx.Flash.Success(ctx.Tr("settings.saved_successfully")) ctx.Redirect(setting.AppSubURL + "/user/settings/appearance") } + +// UpdateUserTimestamps update a user's timestamp preferences +func UpdateUserTimestamps(ctx *context.Context) { + err := user_model.SetUserSetting(ctx.Doer.ID, user_model.SettingsForceAbsoluteTimestamps, strconv.FormatBool(forms.UserTimestampsFromRequest(ctx).ForceAbsoluteTimestamps)) + if err != nil { + ctx.ServerError("SetUserSetting", err) + return + } + + log.Trace("User settings updated: %s", ctx.Doer.Name) + ctx.Flash.Success(ctx.Tr("settings.saved_successfully")) + ctx.Redirect(setting.AppSubURL + "/user/settings/appearance") +} diff --git a/routers/web/web.go b/routers/web/web.go index 779499889fb05..4fcae7efe80d2 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -446,6 +446,7 @@ func RegisterRoutes(m *web.Route) { m.Get("", user_setting.Appearance) m.Post("/language", web.Bind(forms.UpdateLanguageForm{}), user_setting.UpdateUserLang) m.Post("/hidden_comments", user_setting.UpdateUserHiddenComments) + m.Post("/timestamps", user_setting.UpdateUserTimestamps) m.Post("/theme", web.Bind(forms.UpdateThemeForm{}), user_setting.UpdateUIThemePost) }) m.Group("/security", func() { diff --git a/services/forms/user_form.go b/services/forms/user_form.go index 285bc398b26c5..6b01218b5f99f 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -261,6 +261,11 @@ type UpdateLanguageForm struct { Language string } +// UpdateTimestampsForm form for updating profile +type UpdateTimestampsForm struct { + ForceAbsoluteTimestamps bool +} + // Validate validates the fields func (f *UpdateLanguageForm) Validate(req *http.Request, errs binding.Errors) binding.Errors { ctx := context.GetContext(req) diff --git a/services/forms/user_form_timestamps.go b/services/forms/user_form_timestamps.go new file mode 100644 index 0000000000000..f86189f8cded0 --- /dev/null +++ b/services/forms/user_form_timestamps.go @@ -0,0 +1,14 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package forms + +import ( + "code.gitea.io/gitea/modules/context" +) + +// UserTimestampsFromRequest parse the form to hidden comment types bitset +func UserTimestampsFromRequest(ctx *context.Context) *UpdateTimestampsForm { + timestampsForm := &UpdateTimestampsForm{ForceAbsoluteTimestamps: ctx.FormBool("force_absolute_timestamps")} + return timestampsForm +} diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl index 129fca26577f9..6ca9502bed67f 100644 --- a/templates/user/settings/appearance.tmpl +++ b/templates/user/settings/appearance.tmpl @@ -66,6 +66,25 @@ + +

+ {{.locale.Tr "settings.timestamps"}} +

+
+
+ {{.CsrfTokenHtml}} +
+
+ + +
+
+
+ +
+
+
+

{{.locale.Tr "settings.hidden_comment_types"}} From 9aaad2bbb93dca2e99e2332d8ecedff8021eb4df Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 28 Apr 2023 09:37:49 +0000 Subject: [PATCH 2/9] How can I avoid the import cycle? --- modules/timeutil/since.go | 20 +++++++++++++++----- routers/web/user/setting/profile.go | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index 8c835d87f8a3a..3211a6552528b 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -6,9 +6,12 @@ package timeutil import ( "fmt" "html/template" + "strconv" "strings" "time" + "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/translation" ) @@ -131,14 +134,21 @@ func timeSinceUnix(then, now time.Time, lang translation.Locale) template.HTML { } // TimeSince renders relative time HTML given a time.Time -func TimeSince(then time.Time, lang translation.Locale) template.HTML { +func TimeSince(ctx context.Context, then time.Time, lang translation.Locale) template.HTML { // if user forces absolute timestamps, use the full time - // (how can I get the context here? I want to run `user_model.GetUserSetting(ctx.Doer.ID, user_model.SettingsForceAbsoluteTimestamps)`) - // return DateTime("full", then) + val, err := user.GetUserSetting(ctx.Doer.ID, user.SettingsForceAbsoluteTimestamps, "false") + if err != nil { + ctx.ServerError("GetUserSetting", err) + } + forceAbsoluteTimestamps, _ := strconv.ParseBool(val) // we can safely ignore the failed conversion here + if forceAbsoluteTimestamps { + return DateTime("full", then) + } + return timeSinceUnix(then, time.Now(), lang) } // TimeSinceUnix renders relative time HTML given a TimeStamp -func TimeSinceUnix(then TimeStamp, lang translation.Locale) template.HTML { - return TimeSince(then.AsLocalTime(), lang) +func TimeSinceUnix(ctx context.Context, then TimeStamp, lang translation.Locale) template.HTML { + return TimeSince(ctx, then.AsLocalTime(), lang) } diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 8bc25883b33a0..0a0b1eed7e3bf 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -351,7 +351,7 @@ func Appearance(ctx *context.Context) { return forms.IsUserHiddenCommentTypeGroupChecked(commentTypeGroup, hiddenCommentTypes) } - val, err = user_model.GetUserSetting(ctx.Doer.ID, user_model.SettingsForceAbsoluteTimestamps) + val, err = user_model.GetUserSetting(ctx.Doer.ID, user_model.SettingsForceAbsoluteTimestamps, "false") if err != nil { ctx.ServerError("GetUserSetting", err) return From dfa3c2df2a745427aff18cd1f8350cb8a2d9bb79 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 28 Apr 2023 13:04:57 +0000 Subject: [PATCH 3/9] Refactor to allow context and avoid import cycle --- modules/timeutil/since.go | 22 ++++++++++++++++++---- routers/web/web.go | 2 ++ services/user/user.go | 17 +++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index 3211a6552528b..d203617ca5816 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -10,11 +10,25 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/context" + "context" + + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/translation" ) +type PreferenceHelper struct { + GetSetting func(ctx context.Context, key string, def ...string) (string, error) + SettingsForceAbsoluteTimestamps string +} + +var preferenceHelper PreferenceHelper + +func Init(ph *PreferenceHelper) { + if ph != nil { + preferenceHelper = *ph + } +} + // Seconds-based time units const ( Minute = 60 @@ -136,9 +150,9 @@ func timeSinceUnix(then, now time.Time, lang translation.Locale) template.HTML { // TimeSince renders relative time HTML given a time.Time func TimeSince(ctx context.Context, then time.Time, lang translation.Locale) template.HTML { // if user forces absolute timestamps, use the full time - val, err := user.GetUserSetting(ctx.Doer.ID, user.SettingsForceAbsoluteTimestamps, "false") + val, err := preferenceHelper.GetSetting(ctx, preferenceHelper.SettingsForceAbsoluteTimestamps, "false") if err != nil { - ctx.ServerError("GetUserSetting", err) + log.Error("GetSetting %w", err) } forceAbsoluteTimestamps, _ := strconv.ParseBool(val) // we can safely ignore the failed conversion here if forceAbsoluteTimestamps { diff --git a/routers/web/web.go b/routers/web/web.go index 4fcae7efe80d2..b0c0e65de079a 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -44,6 +44,7 @@ import ( context_service "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/forms" "code.gitea.io/gitea/services/lfs" + user_service "code.gitea.io/gitea/services/user" _ "code.gitea.io/gitea/modules/session" // to registers all internal adapters @@ -429,6 +430,7 @@ func RegisterRoutes(m *web.Route) { m.Get("/login/oauth/keys", ignSignInAndCsrf, auth.OIDCKeys) m.Post("/login/oauth/introspect", CorsHandler(), web.Bind(forms.IntrospectTokenForm{}), ignSignInAndCsrf, auth.IntrospectOAuth) + user_service.Init() m.Group("/user/settings", func() { m.Get("", user_setting.Profile) m.Post("", web.Bind(forms.UpdateProfileForm{}), user_setting.ProfilePost) diff --git a/services/user/user.go b/services/user/user.go index d52a2f404bcf0..1bcee277f3c93 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -19,10 +19,12 @@ import ( system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/avatar" + gitea_context "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/eventsource" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" + "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/packages" ) @@ -290,3 +292,18 @@ func DeleteAvatar(u *user_model.User) error { } return nil } + +func Init() { + timeutil.Init(&timeutil.PreferenceHelper{ + GetSetting: func(ctx context.Context, key string, def ...string) (string, error) { + giteaCtx, ok := ctx.(*gitea_context.Context) + + // this casting should always be ok but if it fails we have to provide a fallback + if !ok { + return "false", nil + } + return user_model.GetUserSetting(giteaCtx.Doer.ID, key, def...) + }, + SettingsForceAbsoluteTimestamps: user_model.SettingsForceAbsoluteTimestamps, + }) +} From 7eff90266a6967fa2e00ad654f913845fef3774b Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 28 Apr 2023 13:52:28 +0000 Subject: [PATCH 4/9] find and replace --- 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/devtest/gitea-ui.tmpl | 14 +++++++------- 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 | 4 ++-- 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 | 4 ++-- templates/repo/settings/lfs.tmpl | 2 +- templates/repo/settings/lfs_file_find.tmpl | 2 +- templates/repo/settings/lfs_locks.tmpl | 2 +- templates/repo/tag/list.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 | 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 +- 41 files changed, 66 insertions(+), 66 deletions(-) diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index 0e232c194c2e1..0ee4516eb59a3 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -253,7 +253,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(ctx, 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 7e5295e757b7c..35a7179b60a90 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(ctx, item.EditedUnix, ctx.Locale)) results = append(results, map[string]interface{}{ "name": avatarHTML + "" + name + " " + actionText + " " + timeSinceText, diff --git a/templates/admin/process-row.tmpl b/templates/admin/process-row.tmpl index 8fd2d1af700dc..a7540879ce3f4 100644 --- a/templates/admin/process-row.tmpl +++ b/templates/admin/process-row.tmpl @@ -3,7 +3,7 @@
{{if eq .Process.Type "request"}}{{svg "octicon-globe" 16}}{{else if eq .Process.Type "system"}}{{svg "octicon-cpu" 16}}{{else}}{{svg "octicon-terminal" 16}}{{end}}
{{.Process.Description}}
-
{{TimeSince .Process.Start .root.locale}}
+
{{TimeSince $.Context .Process.Start .root.locale}}
{{if ne .Process.Type "system"}} diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl index 15e51e4aca7ce..874e634686f56 100644 --- a/templates/admin/stacktrace-row.tmpl +++ b/templates/admin/stacktrace-row.tmpl @@ -13,7 +13,7 @@
{{.Process.Description}}
-
{{if ne .Process.Type "none"}}{{TimeSince .Process.Start .root.locale}}{{end}}
+
{{if ne .Process.Type "none"}}{{TimeSince .root.Context .Process.Start .root.locale}}{{end}}
{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}} diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index 2fe478a07d8a0..d739b9b629021 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -26,13 +26,13 @@

TimeSince

-
Now: {{TimeSince .TimeNow $.locale}}
-
5s past: {{TimeSince .TimePast5s $.locale}}
-
5s future: {{TimeSince .TimeFuture5s $.locale}}
-
2m past: {{TimeSince .TimePast2m $.locale}}
-
2m future: {{TimeSince .TimeFuture2m $.locale}}
-
1y past: {{TimeSince .TimePast1y $.locale}}
-
1y future: {{TimeSince .TimeFuture1y $.locale}}
+
Now: {{TimeSince $.Context .TimeNow $.locale}}
+
5s past: {{TimeSince $.Context .TimePast5s $.locale}}
+
5s future: {{TimeSince $.Context .TimeFuture5s $.locale}}
+
2m past: {{TimeSince $.Context .TimePast2m $.locale}}
+
2m future: {{TimeSince $.Context .TimeFuture2m $.locale}}
+
1y past: {{TimeSince $.Context .TimePast1y $.locale}}
+
1y future: {{TimeSince $.Context .TimeFuture1y $.locale}}
diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index b311472b43ed2..47e95ee22a171 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -60,7 +60,7 @@ {{end}}
{{end}} -

{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.locale}}

+

{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix $.Context .UpdatedUnix $.locale}}

{{else}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 2b6398fcd6705..3c59b0401be66 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -22,7 +22,7 @@ {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}
- {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} + {{$timeStr := TimeSinceUnix $.Context .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 ba488586a82e6..157e0700aabd5 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -27,7 +27,7 @@ {{.Version.LowerVersion}}
- {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} + {{$.locale.Tr "packages.published_by" (TimeSinceUnix $.Context .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 3cb130851fee1..86d74c05cb432 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -9,7 +9,7 @@

{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})

- {{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}} + {{$timeStr := TimeSinceUnix $.Context .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}}
{{svg "octicon-repo" 16 "gt-mr-3"}} {{.PackageDescriptor.Repository.FullName}}
{{end}} -
{{svg "octicon-calendar" 16 "gt-mr-3"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}}
+
{{svg "octicon-calendar" 16 "gt-mr-3"}} {{TimeSinceUnix $.Context .PackageDescriptor.Version.CreatedUnix $.locale}}
{{svg "octicon-download" 16 "gt-mr-3"}} {{.PackageDescriptor.Version.DownloadCount}}
{{template "package/metadata/cargo" .}} {{template "package/metadata/chef" .}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index ac4b34a960f25..3c4c9cee8497a 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -40,7 +40,7 @@
  • {{svg .IconName}} {{.Title}}
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{$closedDate:= TimeSinceUnix $.Context .ClosedDateUnix $.locale}} {{if .IsClosed}} {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{end}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index c108d0b370dbe..e366fcd881589 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -218,7 +218,7 @@
    {{.Repo.FullName}}#{{.Index}} - {{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}} + {{$timeStr := TimeSinceUnix $.Context .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 709bfaaced2c4..a04cf5b1b8ea0 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -23,7 +23,7 @@
    -
    {{TimeSinceUnix .Updated $.locale}}
    +
    {{TimeSinceUnix $.Context .Updated $.locale}}
    {{.Duration}}
    • diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 9d15cec051bfe..32771fd977c31 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -131,7 +131,7 @@ {{if not .IsTag}} {{.Title | RenderEmoji $.Context}} {{end}} - {{TimeSinceUnix .CreatedUnix $.locale}} + {{TimeSinceUnix $.Context .CreatedUnix $.locale}}

    {{end}}
    @@ -150,7 +150,7 @@

    {{$.locale.Tr "repo.activity.merged_prs_label"}} #{{.Index}} {{.Issue.Title | RenderEmoji $.Context}} - {{TimeSinceUnix .MergedUnix $.locale}} + {{TimeSinceUnix $.Context .MergedUnix $.locale}}

    {{end}} @@ -169,7 +169,7 @@

    {{$.locale.Tr "repo.activity.opened_prs_label"}} #{{.Index}} {{.Issue.Title | RenderEmoji $.Context}} - {{TimeSinceUnix .Issue.CreatedUnix $.locale}} + {{TimeSinceUnix $.Context .Issue.CreatedUnix $.locale}}

    {{end}} @@ -188,7 +188,7 @@

    {{$.locale.Tr "repo.activity.closed_issue_label"}} #{{.Index}} {{.Title | RenderEmoji $.Context}} - {{TimeSinceUnix .ClosedUnix $.locale}} + {{TimeSinceUnix $.Context .ClosedUnix $.locale}}

    {{end}} @@ -207,7 +207,7 @@

    {{$.locale.Tr "repo.activity.new_issue_label"}} #{{.Index}} {{.Title | RenderEmoji $.Context}} - {{TimeSinceUnix .CreatedUnix $.locale}} + {{TimeSinceUnix $.Context .CreatedUnix $.locale}}

    {{end}} @@ -231,7 +231,7 @@ {{else}} {{.Title | RenderEmoji $.Context}} {{end}} - {{TimeSinceUnix .UpdatedUnix $.locale}} + {{TimeSinceUnix $.Context .UpdatedUnix $.locale}}

    {{end}} diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 596d9ae78bd67..0dd5c565cd2ba 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -18,7 +18,7 @@ {{svg "octicon-shield-lock"}} {{end}} {{.DefaultBranch}} -

    {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DefaultBranchBranch.Commit.ID.String}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}} · {{.locale.Tr "org.repo_updated"}} {{TimeSince .DefaultBranchBranch.Commit.Committer.When .locale}}

    +

    {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .DefaultBranchBranch.Commit.ID.String}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.Commit.CommitMessage .RepoLink .Repository.ComposeMetas}} · {{.locale.Tr "org.repo_updated"}} {{TimeSince .Context .DefaultBranchBranch.Commit.Committer.When .locale}}

    {{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} @@ -60,13 +60,13 @@ {{if .IsDeleted}} {{.Name}} -

    {{$.locale.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.locale}}

    +

    {{$.locale.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix $.Context .DeletedBranch.DeletedUnix $.locale}}

    {{else}} {{if .IsProtected}} {{svg "octicon-shield-lock"}} {{end}} {{.Name}} -

    {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage $.Context .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.locale.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.locale}}

    +

    {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage $.Context .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.locale.Tr "org.repo_updated"}} {{TimeSince $.Context .Commit.Committer.When $.locale}}

    {{end}} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 5e26c04fd879c..00f192245f2ea 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"}} {{.Commit.Author.Name}} {{end}} - {{TimeSince .Commit.Author.When $.locale}} + {{TimeSince $.Context .Commit.Author.When $.locale}} {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} {{.locale.Tr "repo.diff.committed_by"}} {{if ne .Verification.CommittingUser.ID 0}} @@ -277,7 +277,7 @@ {{else}} {{.NoteCommit.Author.Name}} {{end}} - {{TimeSince .NoteCommit.Author.When $.locale}} + {{TimeSince $.Context .NoteCommit.Author.When $.locale}} 
    {{RenderNote $.Context .Note $.RepoLink $.Repository.ComposeMetas}}
    diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 36333c554079c..ae15fa5844495 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -76,9 +76,9 @@ {{end}} {{if .Committer}} - {{TimeSince .Committer.When $.locale}} + {{TimeSince $.Context .Committer.When $.locale}} {{else}} - {{TimeSince .Author.When $.locale}} + {{TimeSince $.Context .Author.When $.locale}} {{end}} {{end}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index f30126153307a..7c4067b9db9b7 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 $.root.Context .CreatedUnix $.root.locale}}
    {{if .OriginalAuthor}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 472bebb33face..ccd7be3fac32d 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -29,7 +29,7 @@
    - {{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}} + {{$closedDate:= TimeSinceUnix $.Context .Milestone.ClosedDateUnix $.locale}} {{if .IsClosed}} {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{else}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 3a23d225c4306..5487ff0b53eb6 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -71,7 +71,7 @@
    - {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} + {{$closedDate:= TimeSinceUnix $.Context .ClosedDateUnix $.locale}} {{if .IsClosed}} {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{else}} @@ -88,7 +88,7 @@ {{svg "octicon-check" 16 "gt-mr-3"}} {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}} - {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}} + {{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix $.Context .UpdatedUnix $.locale) | Safe}}{{end}}
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 7d3bce2b6a872..712c121500bd3 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -15,7 +15,7 @@ - {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}} + {{$createdStr:= TimeSinceUnix $.Context .Issue.CreatedUnix $.locale}}
    diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index b99e49a586342..f49f4aac604b8 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 $.Context .CreatedUnix $.locale}}