From b9319f9a46d2b1a6fe549ec12971fa38315bfea6 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Thu, 10 Nov 2022 09:50:21 +0000 Subject: [PATCH 1/3] Add RenderNumber Signed-off-by: Yarden Shoham --- modules/templates/helper.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index c5434b7c632ed..101f811a7472d 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -47,6 +47,8 @@ import ( "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/gitdiff" + "golang.org/x/text/language" + "golang.org/x/text/message" "github.com/editorconfig/editorconfig-core-go/v2" ) @@ -170,6 +172,7 @@ func NewFuncMap() []template.FuncMap { "RenderEmojiPlain": emoji.ReplaceAliases, "ReactionToEmoji": ReactionToEmoji, "RenderNote": RenderNote, + "RenderNumber": RenderNumber, "RenderMarkdownToHtml": func(input string) template.HTML { output, err := markdown.RenderString(&markup.RenderContext{ URLPrefix: setting.AppSubURL, @@ -782,6 +785,13 @@ func RenderCodeBlock(htmlEscapedTextToRender template.HTML) template.HTML { return template.HTML(htmlWithCodeTags) } +// RenderNumber render any number according to the given language code (e.g. 1234 -> 1,234) +// Should RenderNumber, JsPrettyNumber, and CountFmt coexist on this codebase? RenderNumber is server-rendered and localized +func RenderNumber(number int64, languageCode string) template.HTML { + formatter := message.NewPrinter(language.MustParse(languageCode)) + return template.HTML(formatter.Sprintf("%d", number)) +} + // RenderIssueTitle renders issue/pull title with defined post processors func RenderIssueTitle(ctx context.Context, text, urlPrefix string, metas map[string]string) template.HTML { renderedText, err := markup.RenderIssueTitle(&markup.RenderContext{ From c929ad212f962204fd6ac2b690bae58047a0d5f0 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Thu, 10 Nov 2022 09:51:19 +0000 Subject: [PATCH 2/3] Use RenderNumber Signed-off-by: Yarden Shoham --- templates/code/searchresults.tmpl | 2 +- templates/package/view.tmpl | 2 +- templates/repo/activity.tmpl | 8 ++++---- templates/repo/commits_table.tmpl | 2 +- templates/repo/sub_menu.tmpl | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/code/searchresults.tmpl b/templates/code/searchresults.tmpl index e21a50e1f12df..4651263139bac 100644 --- a/templates/code/searchresults.tmpl +++ b/templates/code/searchresults.tmpl @@ -3,7 +3,7 @@ {{$term.Language}} -
{{$term.Count}}
+
{{RenderNumber $term.Count $.locale.Language}}
 {{end}} diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index a5b2a2ef68a39..3f8ae52af50de 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -41,7 +41,7 @@
{{svg "octicon-repo" 16 "mr-3"}} {{.PackageDescriptor.Repository.FullName}}
{{end}}
{{svg "octicon-calendar" 16 "mr-3"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}}
-
{{svg "octicon-download" 16 "mr-3"}} {{.PackageDescriptor.Version.DownloadCount}}
+
{{svg "octicon-download" 16 "mr-3"}} {{RenderNumber .PackageDescriptor.Version.DownloadCount $.locale.Language}}
{{template "package/metadata/composer" .}} {{template "package/metadata/conan" .}} {{template "package/metadata/container" .}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index cc6ca95edbdb8..a4a887697c765 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -63,21 +63,21 @@
{{if .Permission.CanRead $.UnitTypePullRequests}} - {{svg "octicon-git-pull-request"}} {{.Activity.MergedPRCount}}
+ {{svg "octicon-git-pull-request"}} {{RenderNumber .Activity.MergedPRCount $.locale.Language}}
{{.locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}} - {{svg "octicon-git-branch"}} {{.Activity.OpenedPRCount}}
+ {{svg "octicon-git-branch"}} {{RenderNumber .Activity.OpenedPRCount $.locale.Language}}
{{.locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}} {{end}} {{if .Permission.CanRead $.UnitTypeIssues}} - {{svg "octicon-issue-closed"}} {{.Activity.ClosedIssueCount}}
+ {{svg "octicon-issue-closed"}} {{RenderNumber .Activity.ClosedIssueCount $.locale.Language}}
{{.locale.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}} - {{svg "octicon-issue-opened"}} {{.Activity.OpenedIssueCount}}
+ {{svg "octicon-issue-opened"}} {{RenderNumber .Activity.OpenedIssueCount $.locale.Language}}
{{.locale.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}} {{end}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index ab54041b9d726..5d064ba9367d4 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -1,7 +1,7 @@

{{if or .PageIsCommits (gt .CommitCount 0)}} - {{.CommitCount}} {{.locale.Tr "repo.commits.commits"}} {{if .RefName}}({{.RefName}}){{end}} + {{RenderNumber .CommitCount .locale.Language}} {{.locale.Tr "repo.commits.commits"}} {{if .RefName}}({{.RefName}}){{end}} {{else if .IsNothingToCompare}} {{.locale.Tr "repo.commits.nothing_to_compare"}} {{if .RefName}}({{.RefName}}){{end}} {{else}} diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index fac8e5ac99ddc..63ee3cee86771 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -4,14 +4,14 @@
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}}
- {{svg "octicon-history"}} {{.CommitsCount}} {{.locale.TrN .CommitsCount "repo.commit" "repo.commits"}} + {{svg "octicon-history"}} {{RenderNumber .CommitsCount .locale.Language}} {{.locale.TrN .CommitsCount "repo.commit" "repo.commits"}}
- {{svg "octicon-git-branch"}} {{.BranchesCount}} {{.locale.TrN .BranchesCount "repo.branch" "repo.branches"}} + {{svg "octicon-git-branch"}} {{RenderNumber .BranchesCount .locale.Language}} {{.locale.TrN .BranchesCount "repo.branch" "repo.branches"}}
{{if $.Permission.CanRead $.UnitTypeCode}}
- {{svg "octicon-tag"}} {{.NumTags}} {{.locale.TrN .NumTags "repo.tag" "repo.tags"}} + {{svg "octicon-tag"}} {{RenderNumber .NumTags .locale.Language}} {{.locale.TrN .NumTags "repo.tag" "repo.tags"}}
{{end}}
From 0aa54f2807aaecec01d67a741e9085a36763d8a2 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 11 Nov 2022 01:08:34 +0200 Subject: [PATCH 3/3] Reorder imports Signed-off-by: Yarden Shoham --- modules/templates/helper.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 101f811a7472d..8f166af28611c 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -47,10 +47,10 @@ import ( "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/gitdiff" - "golang.org/x/text/language" - "golang.org/x/text/message" "github.com/editorconfig/editorconfig-core-go/v2" + "golang.org/x/text/language" + "golang.org/x/text/message" ) // Used from static.go && dynamic.go