Skip to content

Commit db0947b

Browse files
wxiaoguangwxiaoguang
committed
refactor
1 parent 35e562d commit db0947b

File tree

14 files changed

+79
-60
lines changed

14 files changed

+79
-60
lines changed

‎modules/templates/helper.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ func NewFuncMap() []template.FuncMap {
132132
// -----------------------------------------------------------------
133133
// time / number / format
134134
"FileSize": base.FileSize,
135-
"LocaleNumber": LocaleNumber,
136135
"CountFmt": base.FormatNumberSI,
137136
"TimeSince": timeutil.TimeSince,
138137
"TimeSinceUnix": timeutil.TimeSinceUnix,
@@ -782,12 +781,6 @@ func mirrorRemoteAddress(ctx context.Context, m *repo_model.Repository, remoteNa
782781
return a
783782
}
784783

785-
// LocaleNumber renders a number with a Custom Element, browser will render it with a locale number
786-
func LocaleNumber(v interface{}) template.HTML {
787-
num, _ := util.ToInt64(v)
788-
return template.HTML(fmt.Sprintf(`<gitea-locale-number data-number="%d">%d</gitea-locale-number>`, num, num))
789-
}
790-
791784
// Eval the expression and return the result, see the comment of eval.Expr for details.
792785
// To use this helper function in templates, pass each token as a separate parameter.
793786
//

‎modules/translation/translation.go

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,20 @@ import (
1515
"code.gitea.io/gitea/modules/translation/i18n"
1616

1717
"golang.org/x/text/language"
18+
"golang.org/x/text/message"
19+
"golang.org/x/text/number"
1820
)
1921

2022
type contextKey struct{}
2123

22-
var ContextKey interface{} = &contextKey{}
24+
var ContextKey any = &contextKey{}
2325

2426
// Locale represents an interface to translation
2527
type Locale interface {
2628
Language() string
27-
Tr(string, ...interface{}) string
28-
TrN(cnt interface{}, key1, keyN string, args ...interface{}) string
29+
Tr(string, ...any) string
30+
TrN(cnt any, key1, keyN string, args ...any) string
31+
PrettyNumber(v any) string
2932
}
3033

3134
// LangType represents a lang type
@@ -135,6 +138,7 @@ func Match(tags ...language.Tag) language.Tag {
135138
type locale struct {
136139
i18n.Locale
137140
Lang, LangName string // these fields are used directly in templates: .i18n.Lang
141+
msgPrinter *message.Printer
138142
}
139143

140144
// NewLocale return a locale
@@ -148,11 +152,22 @@ func NewLocale(lang string) Locale {
148152
if l, ok := allLangMap[lang]; ok {
149153
langName = l.Name
150154
}
155+
156+
var msgPrinter *message.Printer
157+
langTag, err := language.Parse(lang)
158+
if err != nil {
159+
log.Error("Failed to parse language tag from name %q: %v", lang, err)
160+
msgPrinter = message.NewPrinter(language.English)
161+
} else {
162+
msgPrinter = message.NewPrinter(langTag)
163+
}
164+
151165
i18nLocale, _ := i18n.GetLocale(lang)
152166
return &locale{
153-
Locale: i18nLocale,
154-
Lang: lang,
155-
LangName: langName,
167+
Locale: i18nLocale,
168+
Lang: lang,
169+
LangName: langName,
170+
msgPrinter: msgPrinter,
156171
}
157172
}
158173

@@ -199,7 +214,7 @@ var trNLangRules = map[string]func(int64) int{
199214
}
200215

201216
// TrN returns translated message for plural text translation
202-
func (l *locale) TrN(cnt interface{}, key1, keyN string, args ...interface{}) string {
217+
func (l *locale) TrN(cnt any, key1, keyN string, args ...any) string {
203218
var c int64
204219
if t, ok := cnt.(int); ok {
205220
c = int64(t)
@@ -223,3 +238,8 @@ func (l *locale) TrN(cnt interface{}, key1, keyN string, args ...interface{}) st
223238
}
224239
return l.Tr(keyN, args...)
225240
}
241+
242+
func (l *locale) PrettyNumber(v any) string {
243+
// TODO: this mechanism is not good enough, the complete solution is to switch the translation system to ICU message format
244+
return l.msgPrinter.Sprintf("%v", number.Decimal(v))
245+
}

‎modules/translation/translation_test.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright 2023 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package translation
5+
6+
import (
7+
"testing"
8+
9+
"code.gitea.io/gitea/modules/translation/i18n"
10+
11+
"github.com/stretchr/testify/assert"
12+
)
13+
14+
func TestPrettyNumber(t *testing.T) {
15+
// TODO: make this package friendly to testing
16+
17+
i18n.ResetDefaultLocales()
18+
19+
allLangMap = make(map[string]*LangType)
20+
allLangMap["id-ID"] = &LangType{Lang: "id-ID", Name: "Bahasa Indonesia"}
21+
22+
l := NewLocale("id-ID")
23+
assert.EqualValues(t, "1.000.000", l.PrettyNumber(1000000))
24+
25+
l = NewLocale("nosuch")
26+
assert.EqualValues(t, "1,000,000", l.PrettyNumber(1000000))
27+
}

‎templates/projects/list.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<div class="ui compact tiny menu">
1414
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=open">
1515
{{svg "octicon-project-symlink" 16 "gt-mr-3"}}
16-
{{LocaleNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
16+
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
1717
</a>
1818
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=closed">
1919
{{svg "octicon-check" 16 "gt-mr-3"}}
20-
{{LocaleNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
20+
{{.locale.PrettyNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
2121
</a>
2222
</div>
2323

@@ -46,9 +46,9 @@
4646
{{end}}
4747
<span class="issue-stats">
4848
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
49-
{{LocaleNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
49+
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
5050
{{svg "octicon-check" 16 "gt-mr-3"}}
51-
{{LocaleNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
51+
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
5252
</span>
5353
</div>
5454
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}

‎templates/repo/issue/milestones.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<div class="ui compact tiny menu">
1919
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=open&q={{$.Keyword}}">
2020
{{svg "octicon-milestone" 16 "gt-mr-3"}}
21-
{{LocaleNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
21+
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
2222
</a>
2323
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=closed&q={{$.Keyword}}">
2424
{{svg "octicon-check" 16 "gt-mr-3"}}
25-
{{LocaleNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
25+
{{.locale.PrettyNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
2626
</a>
2727
</div>
2828
</div>
@@ -84,9 +84,9 @@
8484
{{end}}
8585
<span class="issue-stats">
8686
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
87-
{{LocaleNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
87+
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
8888
{{svg "octicon-check" 16 "gt-mr-3"}}
89-
{{LocaleNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
89+
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
9090
{{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}}
9191
{{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}}
9292
</span>

‎templates/repo/issue/openclose.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
{{else}}
66
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
77
{{end}}
8-
{{LocaleNumber .IssueStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
8+
{{.locale.PrettyNumber .IssueStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
99
</a>
1010
<a class="{{if .IsShowClosed}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&project={{.ProjectID}}&assignee={{.AssigneeID}}&poster={{.PosterID}}">
1111
{{svg "octicon-check" 16 "gt-mr-3"}}
12-
{{LocaleNumber .IssueStats.ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
12+
{{.locale.PrettyNumber .IssueStats.ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
1313
</a>
1414
</div>

‎templates/repo/projects/list.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<div class="ui compact tiny menu">
1616
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=open">
1717
{{svg "octicon-project" 16 "gt-mr-3"}}
18-
{{LocaleNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
18+
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
1919
</a>
2020
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=closed">
2121
{{svg "octicon-check" 16 "gt-mr-3"}}
22-
{{LocaleNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
22+
{{.locale.PrettyNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
2323
</a>
2424
</div>
2525

@@ -48,9 +48,9 @@
4848
{{end}}
4949
<span class="issue-stats">
5050
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
51-
{{LocaleNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
51+
{{.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
5252
{{svg "octicon-check" 16 "gt-mr-3"}}
53-
{{LocaleNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
53+
{{.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
5454
</span>
5555
</div>
5656
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}

‎templates/repo/release/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@
161161
<li>
162162
<span class="ui text middle aligned right">
163163
<span class="ui text grey">{{.Size | FileSize}}</span>
164-
<gitea-locale-number data-number-in-tooltip="{{dict "message" ($.locale.Tr "repo.release.download_count") "number" .DownloadCount | Json}}">
164+
<span data-tooltip-content="{{$.locale.Tr "repo.release.download_count" ($.locale.PrettyNumber .DownloadCount)}}">
165165
{{svg "octicon-info"}}
166-
</gitea-locale-number>
166+
</span>
167167
</span>
168168
<a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}">
169169
<strong>{{svg "octicon-package" 16 "gt-mr-2"}}{{.Name}}</strong>

‎templates/repo/release/new.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
<input name="attachment-edit-{{.UUID}}" class="gt-mr-3 attachment_edit" required value="{{.Name}}">
7272
<input name="attachment-del-{{.UUID}}" type="hidden" value="false">
7373
<span class="ui text grey gt-mr-3">{{.Size | FileSize}}</span>
74-
<gitea-locale-number data-number-in-tooltip="{{dict "message" ($.locale.Tr "repo.release.download_count") "number" .DownloadCount | Json}}">
74+
<span data-tooltip-content="{{$.locale.Tr "repo.release.download_count" ($.locale.PrettyNumber .DownloadCount)}}">
7575
{{svg "octicon-info"}}
76-
</gitea-locale-number>
76+
</span>
7777
</div>
7878
</div>
7979
{{end}}

‎templates/repo/sub_menu.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="ui two horizontal center list">
55
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}}
66
<div class="item{{if .PageIsCommits}} active{{end}}">
7-
<a href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}">{{svg "octicon-history"}} <b>{{LocaleNumber .CommitsCount}}</b> {{.locale.TrN .CommitsCount "repo.commit" "repo.commits"}}</a>
7+
<a href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}">{{svg "octicon-history"}} <b>{{.locale.PrettyNumber .CommitsCount}}</b> {{.locale.TrN .CommitsCount "repo.commit" "repo.commits"}}</a>
88
</div>
99
<div class="item{{if .PageIsBranches}} active{{end}}">
1010
<a href="{{.RepoLink}}/branches">{{svg "octicon-git-branch"}} <b>{{.BranchesCount}}</b> {{.locale.TrN .BranchesCount "repo.branch" "repo.branches"}}</a>

‎templates/user/dashboard/issues.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
<div class="ui compact tiny menu">
6666
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}">
6767
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
68-
{{LocaleNumber .IssueStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
68+
{{.locale.PrettyNumber .IssueStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
6969
</a>
7070
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}">
7171
{{svg "octicon-issue-closed" 16 "gt-mr-3"}}
72-
{{LocaleNumber .IssueStats.ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
72+
{{.locale.PrettyNumber .IssueStats.ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
7373
</a>
7474
</div>
7575
</div>

‎templates/user/dashboard/milestones.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
<div class="ui compact tiny menu">
4040
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}">
4141
{{svg "octicon-milestone" 16 "gt-mr-3"}}
42-
{{LocaleNumber .MilestoneStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
42+
{{.locale.PrettyNumber .MilestoneStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
4343
</a>
4444
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}">
4545
{{svg "octicon-check" 16 "gt-mr-3"}}
46-
{{LocaleNumber .MilestoneStats.ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
46+
{{.locale.PrettyNumber .MilestoneStats.ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
4747
</a>
4848
</div>
4949
</div>
@@ -104,9 +104,9 @@
104104
{{end}}
105105
<span class="issue-stats">
106106
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
107-
{{LocaleNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
107+
{{.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
108108
{{svg "octicon-check" 16 "gt-mr-3"}}
109-
{{LocaleNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
109+
{{.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
110110
{{if .TotalTrackedTime}}
111111
{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}
112112
{{end}}

‎web_src/js/webcomponents/GiteaLocaleNumber.js

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎web_src/js/webcomponents/webcomponents.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
import '@webcomponents/custom-elements'; // polyfill for some browsers like Pale Moon
22
import '@github/relative-time-element';
3-
import './GiteaLocaleNumber.js';
43
import './GiteaOriginUrl.js';

0 commit comments

Comments
 (0)