From 99d4a266b9aac13f20244b9fe0fce998d2c34b30 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 31 Dec 2021 20:02:49 +0800 Subject: [PATCH 1/7] Unify and simplify TrN for i18n --- modules/csv/csv_test.go | 14 ++-- modules/templates/helper.go | 64 ------------------- modules/test/context_tests.go | 4 ++ modules/translation/translation.go | 64 +++++++++++++++++++ routers/web/repo/migrate.go | 7 +- routers/web/repo/repo.go | 7 +- routers/web/repo/setting.go | 7 +- services/mailer/mail.go | 5 -- services/mailer/mail_release.go | 1 - services/mailer/mail_repo.go | 1 - templates/mail/issue/default.tmpl | 2 +- templates/repo/activity.tmpl | 55 ++++++++++------ templates/repo/blame.tmpl | 2 +- templates/repo/create.tmpl | 2 +- .../repo/issue/view_content/comments.tmpl | 6 +- templates/repo/issue/view_content/pull.tmpl | 4 +- templates/repo/sub_menu.tmpl | 6 +- templates/repo/view_file.tmpl | 2 +- templates/shared/issuelist.tmpl | 8 +-- 19 files changed, 132 insertions(+), 129 deletions(-) diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index d72c3e3a7329c..09b718bae8f63 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -47,11 +47,11 @@ a, b c e f g h i j l -m n, +m n, p q r u v w x -y +y `, expectedRows: [][]string{ {"col1", "col2", "col3"}, @@ -74,7 +74,7 @@ y a, b, c d,e,f ,h, i -j, , +j, , , , `, expectedRows: [][]string{ {"col1", "col2", "col3"}, @@ -353,7 +353,7 @@ John Doe john@doe.com This,note,had,a,lot,of,commas,to,test,delimters`, quoted, text," a 2 "some, -quoted, +quoted, text," b 3 "some, quoted, @@ -459,7 +459,7 @@ func TestGuessFromBeforeAfterQuotes(t *testing.T) { quoted, text," a 2 "some, -quoted, +quoted, text," b 3 "some, quoted, @@ -549,6 +549,10 @@ func (l mockLocale) Tr(s string, _ ...interface{}) string { return s } +func (l mockLocale) TrN(_cnt interface{}, key1, _keyN string, _args ...interface{}) string { + return key1 +} + func TestFormatError(t *testing.T) { var cases = []struct { err error diff --git a/modules/templates/helper.go b/modules/templates/helper.go index a05c0c1a95ff1..fc07b49c71925 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -239,7 +239,6 @@ func NewFuncMap() []template.FuncMap { "DisableImportLocal": func() bool { return !setting.ImportLocalPaths }, - "TrN": TrN, "Dict": func(values ...interface{}) (map[string]interface{}, error) { if len(values)%2 != 0 { return nil, errors.New("invalid dict call") @@ -857,69 +856,6 @@ func DiffLineTypeToStr(diffType int) string { return "same" } -// Language specific rules for translating plural texts -var trNLangRules = map[string]func(int64) int{ - "en-US": func(cnt int64) int { - if cnt == 1 { - return 0 - } - return 1 - }, - "lv-LV": func(cnt int64) int { - if cnt%10 == 1 && cnt%100 != 11 { - return 0 - } - return 1 - }, - "ru-RU": func(cnt int64) int { - if cnt%10 == 1 && cnt%100 != 11 { - return 0 - } - return 1 - }, - "zh-CN": func(cnt int64) int { - return 0 - }, - "zh-HK": func(cnt int64) int { - return 0 - }, - "zh-TW": func(cnt int64) int { - return 0 - }, - "fr-FR": func(cnt int64) int { - if cnt > -2 && cnt < 2 { - return 0 - } - return 1 - }, -} - -// TrN returns key to be used for plural text translation -func TrN(lang string, cnt interface{}, key1, keyN string) string { - var c int64 - if t, ok := cnt.(int); ok { - c = int64(t) - } else if t, ok := cnt.(int16); ok { - c = int64(t) - } else if t, ok := cnt.(int32); ok { - c = int64(t) - } else if t, ok := cnt.(int64); ok { - c = t - } else { - return keyN - } - - ruleFunc, ok := trNLangRules[lang] - if !ok { - ruleFunc = trNLangRules["en-US"] - } - - if ruleFunc(c) == 0 { - return key1 - } - return keyN -} - // MigrationIcon returns a SVG name matching the service an issue/comment was migrated from func MigrationIcon(hostname string) string { switch hostname { diff --git a/modules/test/context_tests.go b/modules/test/context_tests.go index 1f893122f3f73..62ec21f6fe176 100644 --- a/modules/test/context_tests.go +++ b/modules/test/context_tests.go @@ -103,6 +103,10 @@ func (l mockLocale) Tr(s string, _ ...interface{}) string { return s } +func (l mockLocale) TrN(_cnt interface{}, key1, _keyN string, _args ...interface{}) string { + return key1 +} + type mockResponseWriter struct { httptest.ResponseRecorder size int diff --git a/modules/translation/translation.go b/modules/translation/translation.go index 77cc9ac7f5847..aa5bd928d0f99 100644 --- a/modules/translation/translation.go +++ b/modules/translation/translation.go @@ -17,6 +17,7 @@ import ( type Locale interface { Language() string Tr(string, ...interface{}) string + TrN(cnt interface{}, key1, keyN string, args ...interface{}) string } // LangType represents a lang type @@ -99,3 +100,66 @@ func (l *locale) Language() string { func (l *locale) Tr(format string, args ...interface{}) string { return i18n.Tr(l.Lang, format, args...) } + +// Language specific rules for translating plural texts +var trNLangRules = map[string]func(int64) int{ + "en-US": func(cnt int64) int { + if cnt == 1 { + return 0 + } + return 1 + }, + "lv-LV": func(cnt int64) int { + if cnt%10 == 1 && cnt%100 != 11 { + return 0 + } + return 1 + }, + "ru-RU": func(cnt int64) int { + if cnt%10 == 1 && cnt%100 != 11 { + return 0 + } + return 1 + }, + "zh-CN": func(cnt int64) int { + return 0 + }, + "zh-HK": func(cnt int64) int { + return 0 + }, + "zh-TW": func(cnt int64) int { + return 0 + }, + "fr-FR": func(cnt int64) int { + if cnt > -2 && cnt < 2 { + return 0 + } + return 1 + }, +} + +// TrN returns translated message for plural text translation +func (l *locale) TrN(cnt interface{}, key1, keyN string, args ...interface{}) string { + var c int64 + if t, ok := cnt.(int); ok { + c = int64(t) + } else if t, ok := cnt.(int16); ok { + c = int64(t) + } else if t, ok := cnt.(int32); ok { + c = int64(t) + } else if t, ok := cnt.(int64); ok { + c = t + } else { + return l.Tr(keyN, args...) + } + + ruleFunc, ok := trNLangRules[l.Lang] + if !ok { + ruleFunc = trNLangRules["en-US"] + } + + if ruleFunc(c) == 0 { + return l.Tr(key1, args...) + } + return l.Tr(keyN, args...) +} diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index 9b1265383908e..dc9a05e0651ba 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -81,13 +81,8 @@ func handleMigrateError(ctx *context.Context, owner *user_model.User, err error, case migrations.IsTwoFactorAuthError(err): ctx.RenderWithErr(ctx.Tr("form.2fa_auth_required"), tpl, form) case repo_model.IsErrReachLimitOfRepo(err): - var msg string maxCreationLimit := ctx.User.MaxCreationLimit() - if maxCreationLimit == 1 { - msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit) - } else { - msg = ctx.Tr("repo.form.reach_limit_of_creation_n", maxCreationLimit) - } + msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_1", maxCreationLimit) ctx.RenderWithErr(msg, tpl, form) case repo_model.IsErrRepoAlreadyExist(err): ctx.Data["Err_RepoName"] = true diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 0d8c6d374f989..1d074f886394b 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -162,13 +162,8 @@ func Create(ctx *context.Context) { func handleCreateError(ctx *context.Context, owner *user_model.User, err error, name string, tpl base.TplName, form interface{}) { switch { case repo_model.IsErrReachLimitOfRepo(err): - var msg string maxCreationLimit := ctx.User.MaxCreationLimit() - if maxCreationLimit == 1 { - msg = ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit) - } else { - msg = ctx.Tr("repo.form.reach_limit_of_creation_n", maxCreationLimit) - } + msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_1", maxCreationLimit) ctx.RenderWithErr(msg, tpl, form) case repo_model.IsErrRepoAlreadyExist(err): ctx.Data["Err_RepoName"] = true diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index 5457e651d38f6..9c9de2ee144cf 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -610,11 +610,8 @@ func SettingsPost(ctx *context.Context) { if !ctx.Repo.Owner.CanCreateRepo() { maxCreationLimit := ctx.User.MaxCreationLimit() - if maxCreationLimit == 1 { - ctx.Flash.Error(ctx.Tr("repo.form.reach_limit_of_creation_1", maxCreationLimit)) - } else { - ctx.Flash.Error(ctx.Tr("repo.form.reach_limit_of_creation_n", maxCreationLimit)) - } + msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_1", maxCreationLimit) + ctx.Flash.Error(msg) ctx.Redirect(repo.Link() + "/settings") return } diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 0a5573707396c..20552be584781 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -78,7 +78,6 @@ func sendUserMail(language string, u *user_model.User, tpl base.TplName, code, s // helper "i18n": locale, "Str2html": templates.Str2html, - "TrN": templates.TrN, } var content bytes.Buffer @@ -129,7 +128,6 @@ func SendActivateEmailMail(u *user_model.User, email *user_model.EmailAddress) { // helper "i18n": locale, "Str2html": templates.Str2html, - "TrN": templates.TrN, } var content bytes.Buffer @@ -160,7 +158,6 @@ func SendRegisterNotifyMail(u *user_model.User) { // helper "i18n": locale, "Str2html": templates.Str2html, - "TrN": templates.TrN, } var content bytes.Buffer @@ -194,7 +191,6 @@ func SendCollaboratorMail(u, doer *user_model.User, repo *repo_model.Repository) // helper "i18n": locale, "Str2html": templates.Str2html, - "TrN": templates.TrN, } var content bytes.Buffer @@ -278,7 +274,6 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient // helper "i18n": locale, "Str2html": templates.Str2html, - "TrN": templates.TrN, } var mailSubject bytes.Buffer diff --git a/services/mailer/mail_release.go b/services/mailer/mail_release.go index 02aa0f312e36f..ee4c6f3a59cd0 100644 --- a/services/mailer/mail_release.go +++ b/services/mailer/mail_release.go @@ -76,7 +76,6 @@ func mailNewRelease(lang string, tos []string, rel *models.Release) { // helper "i18n": locale, "Str2html": templates.Str2html, - "TrN": templates.TrN, } var mailBody bytes.Buffer diff --git a/services/mailer/mail_repo.go b/services/mailer/mail_repo.go index 51b16aa7e270f..a5343f81286e4 100644 --- a/services/mailer/mail_repo.go +++ b/services/mailer/mail_repo.go @@ -71,7 +71,6 @@ func sendRepoTransferNotifyMailPerLang(lang string, newOwner, doer *user_model.U // helper "i18n": locale, "Str2html": templates.Str2html, - "TrN": templates.TrN, } if err := bodyTemplates.ExecuteTemplate(&content, string(mailRepoTransferNotify), data); err != nil { diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index e01ec667eedc8..aa91861d11abc 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -30,7 +30,7 @@ {{.i18n.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink | Str2html}} {{else}} - {{.i18n.Tr (TrN .i18n.Lang (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n") .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits) | Str2html}} + {{.i18n.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits) | Str2html}} {{end}}

{{end}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index c67925e4233ca..3086ca8e8d3ce 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -41,7 +41,7 @@ {{end}} - {{.i18n.Tr (TrN .i18n.Lang .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n") .Activity.ActivePRCount | Safe }} + {{.i18n.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount | Safe }} {{end}} {{if .Permission.CanRead $.UnitTypeIssues}} @@ -56,7 +56,7 @@ {{end}} - {{.i18n.Tr (TrN .i18n.Lang .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n") .Activity.ActiveIssueCount | Safe }} + {{.i18n.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount | Safe }} {{end}} @@ -64,21 +64,21 @@ {{if .Permission.CanRead $.UnitTypePullRequests}} {{svg "octicon-git-pull-request"}} {{.Activity.MergedPRCount}}
- {{.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n") }} + {{.i18n.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}} {{svg "octicon-git-branch"}} {{.Activity.OpenedPRCount}}
- {{.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n") }} + {{.i18n.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}}
- {{.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n") }} + {{.i18n.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}} {{svg "octicon-issue-opened"}} {{.Activity.OpenedIssueCount}}
- {{.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n") }} + {{.i18n.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}} {{end}} @@ -94,19 +94,19 @@
{{.i18n.Tr "repo.activity.git_stats_exclude_merges" }} - {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n") .Activity.Code.AuthorCount }} - {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n") }} - {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n") .Activity.Code.CommitCount }} + {{.i18n.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n" .Activity.Code.AuthorCount}} + {{.i18n.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n"}} + {{.i18n.TrN .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCount}} {{.i18n.Tr "repo.activity.git_stats_push_to_branch" .Repository.DefaultBranch }} - {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n") .Activity.Code.CommitCountInAllBranches }} + {{.i18n.TrN .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCountInAllBranches}} {{.i18n.Tr "repo.activity.git_stats_push_to_all_branches" }} {{.i18n.Tr "repo.activity.git_stats_on_default_branch" .Repository.DefaultBranch }} - {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n") .Activity.Code.ChangedFiles }} - {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n") }} + {{.i18n.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n" .Activity.Code.ChangedFiles}} + {{.i18n.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n"}} {{.i18n.Tr "repo.activity.git_stats_additions" }} - {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n") .Activity.Code.Additions }} + {{.i18n.TrN .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n" .Activity.Code.Additions}} {{.i18n.Tr "repo.activity.git_stats_and_deletions" }} - {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n") .Activity.Code.Deletions }}. + {{.i18n.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}.
@@ -118,7 +118,10 @@ {{if gt .Activity.PublishedReleaseCount 0}}

{{svg "octicon-tag"}} - {{.i18n.Tr "repo.activity.title.releases_published_by" (.i18n.Tr (TrN .i18n.Lang .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n") .Activity.PublishedReleaseCount) (.i18n.Tr (TrN .i18n.Lang .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.PublishedReleaseAuthorCount) }} + {{.i18n.Tr "repo.activity.title.releases_published_by" + (.i18n.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount) + (.i18n.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount) + }}

{{range .Activity.PublishedReleases}} @@ -137,7 +140,10 @@ {{if gt .Activity.MergedPRCount 0}}

{{svg "octicon-git-pull-request"}} - {{.i18n.Tr "repo.activity.title.prs_merged_by" (.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n") .Activity.MergedPRCount) (.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.MergedPRAuthorCount) }} + {{.i18n.Tr "repo.activity.title.prs_merged_by" + (.i18n.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount) + (.i18n.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount) + }}

{{range .Activity.MergedPRs}} @@ -153,7 +159,10 @@ {{if gt .Activity.OpenedPRCount 0}}

{{svg "octicon-git-branch"}} - {{.i18n.Tr "repo.activity.title.prs_opened_by" (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n") .Activity.OpenedPRCount) (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.OpenedPRAuthorCount) }} + {{.i18n.Tr "repo.activity.title.prs_opened_by" + (.i18n.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount) + (.i18n.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount) + }}

{{range .Activity.OpenedPRs}} @@ -169,7 +178,10 @@ {{if gt .Activity.ClosedIssueCount 0}}

{{svg "octicon-issue-closed"}} - {{.i18n.Tr "repo.activity.title.issues_closed_from" (.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n") .Activity.ClosedIssueCount) (.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.ClosedIssueAuthorCount) }} + {{.i18n.Tr "repo.activity.title.issues_closed_from" + (.i18n.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount) + (.i18n.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount) + }}

{{range .Activity.ClosedIssues}} @@ -185,7 +197,10 @@ {{if gt .Activity.OpenedIssueCount 0}}

{{svg "octicon-issue-opened"}} - {{.i18n.Tr "repo.activity.title.issues_created_by" (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n") .Activity.OpenedIssueCount) (.i18n.Tr (TrN .i18n.Lang .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n") .Activity.OpenedIssueAuthorCount) }} + {{.i18n.Tr "repo.activity.title.issues_created_by" + (.i18n.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount) + (.i18n.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount) + }}

{{range .Activity.OpenedIssues}} @@ -201,7 +216,7 @@ {{if gt .Activity.UnresolvedIssueCount 0}}

{{svg "octicon-comment-discussion"}} - {{.i18n.Tr (TrN .i18n.Lang .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n") .Activity.UnresolvedIssueCount }} + {{.i18n.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}

{{.i18n.Tr "repo.activity.unresolved_conv_desc"}} diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 0b37f41c28c41..cdd31c0eba7aa 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -3,7 +3,7 @@
- {{.NumLines}} {{.i18n.Tr (TrN .i18n.Lang .NumLines "repo.line" "repo.lines") }} + {{.NumLines}} {{.i18n.TrN .NumLines "repo.line" "repo.lines"}}
{{FileSize .FileSize}}
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index c7aaf54351333..c250b0d4a988c 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -16,7 +16,7 @@ {{if not .CanCreateRepo}}
-

{{.i18n.Tr (TrN .i18n.Lang .MaxCreationLimit "repo.form.reach_limit_of_creation_1" "repo.form.reach_limit_of_creation_n") .MaxCreationLimit}}

+

{{.i18n.TrN .MaxCreationLimit "repo.form.reach_limit_of_creation_1" "repo.form.reach_limit_of_creation_n" .MaxCreationLimit}}

{{end}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index c229028540d7b..026e1de0fd1ac 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -187,9 +187,9 @@ {{.Poster.GetDisplayName}} {{if and .AddedLabels (not .RemovedLabels)}} - {{$.i18n.Tr (TrN $.i18n.Lang (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels") (RenderLabels .AddedLabels) $createdStr | Safe}} + {{$.i18n.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels) $createdStr | Safe}} {{else if and (not .AddedLabels) .RemovedLabels}} - {{$.i18n.Tr (TrN $.i18n.Lang (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels") (RenderLabels .RemovedLabels) $createdStr | Safe}} + {{$.i18n.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels .RemovedLabels) $createdStr | Safe}} {{else}} {{$.i18n.Tr "repo.issues.add_remove_labels" (RenderLabels .AddedLabels) (RenderLabels .RemovedLabels) $createdStr | Safe}} {{end}} @@ -716,7 +716,7 @@ {{ if .IsForcePush }} {{$.i18n.Tr "repo.issues.force_push_codes" ($.Issue.PullRequest.HeadBranch|Escape) (ShortSha .OldCommit) (($.Issue.Repo.CommitLink .OldCommit)|Escape) (ShortSha .NewCommit) (($.Issue.Repo.CommitLink .NewCommit)|Escape) $createdStr | Safe}} {{else}} - {{$.i18n.Tr (TrN $.i18n.Lang (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n") (len .Commits) $createdStr | Safe}} + {{$.i18n.TrN (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n" (len .Commits) $createdStr | Safe}} {{end}}
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index bb80bba7c81a9..85076027d1cfe 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -224,7 +224,7 @@ {{else if .IsBlockedByChangedProtectedFiles}}
{{svg "octicon-x" 16}} - {{$.i18n.Tr (TrN $.i18n.Lang $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n") | Safe }} + {{$.i18n.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" | Safe }}
{{range .ChangedProtectedFiles}}
{{.}}
@@ -555,7 +555,7 @@ {{else if .IsBlockedByChangedProtectedFiles}}
{{svg "octicon-x" 16}} - {{$.i18n.Tr (TrN $.i18n.Lang $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n") | Safe }} + {{$.i18n.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" | Safe }}
{{range .ChangedProtectedFiles}}
{{.}}
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index 5ba88f735660e..57bef2e40f2b2 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -3,14 +3,14 @@
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}}
- {{svg "octicon-history"}} {{.CommitsCount}} {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }} + {{svg "octicon-history"}} {{.CommitsCount}} {{.i18n.TrN .CommitsCount "repo.commit" "repo.commits"}}
- {{svg "octicon-git-branch"}} {{.BranchesCount}} {{.i18n.Tr (TrN .i18n.Lang .BranchesCount "repo.branch" "repo.branches") }} + {{svg "octicon-git-branch"}} {{.BranchesCount}} {{.i18n.TrN .BranchesCount "repo.branch" "repo.branches"}}
{{if $.Permission.CanRead $.UnitTypeCode}}
- {{svg "octicon-tag"}} {{.NumTags}} {{.i18n.Tr (TrN .i18n.Lang .NumTags "repo.tag" "repo.tags") }} + {{svg "octicon-tag"}} {{.NumTags}} {{.i18n.TrN .NumTags "repo.tag" "repo.tags"}}
{{end}}
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 6698e6bbe5abe..6bd54cc8e53ae 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -13,7 +13,7 @@ {{end}} {{if .NumLinesSet}}
- {{.NumLines}} {{.i18n.Tr (TrN .i18n.Lang .NumLines "repo.line" "repo.lines") }} + {{.NumLines}} {{.i18n.TrN .NumLines "repo.line" "repo.lines"}}
{{end}} {{if .FileSize}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 0b68a03414b10..3050107123cb6 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -91,25 +91,25 @@ {{if gt $approveOfficial 0}} {{svg "octicon-check" 14 "mr-1"}} - {{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}} + {{$.i18n.TrN $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n" $approveOfficial}} {{end}} {{if gt $rejectOfficial 0}} {{svg "octicon-diff" 14 "mr-2"}} - {{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}} + {{$.i18n.TrN $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n" $rejectOfficial}} {{end}} {{if gt $waitingOfficial 0}} {{svg "octicon-eye" 14 "mr-2"}} - {{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}} + {{$.i18n.TrN $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n" $waitingOfficial}} {{end}} {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}} {{svg "octicon-x" 14}} - {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}} + {{$.i18n.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}} {{end}} {{end}} From 67a26ddbaba80320065ac2e80ac533ffbf6e6c84 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 31 Dec 2021 20:24:47 +0800 Subject: [PATCH 2/7] fix legacy unit test --- modules/csv/csv_test.go | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index 09b718bae8f63..4ea9b1e3f8d3a 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -8,6 +8,7 @@ import ( "bytes" "encoding/csv" "io" + "strconv" "strings" "testing" @@ -21,14 +22,23 @@ func TestCreateReader(t *testing.T) { assert.Equal(t, ',', rd.Comma) } -//nolint +func decodeSlashes(s string) string { + s = strings.ReplaceAll(s, "\n", "\\n") + s = strings.ReplaceAll(s, "\"", "\\\"") + decoded, err := strconv.Unquote(`"` + s + `"`) + if err != nil { + panic("unable to decode string:" + err.Error() + "\n" + s) + } + return decoded +} + func TestCreateReaderAndDetermineDelimiter(t *testing.T) { var cases = []struct { csv string expectedRows [][]string expectedDelimiter rune }{ - // case 0 - semicolon delmited + // case 0 - semicolon delimited { csv: `a;b;c 1;2;3 @@ -47,11 +57,11 @@ a, b c e f g h i j l -m n, +m n,\t p q r u v w x -y +y\t\t `, expectedRows: [][]string{ {"col1", "col2", "col3"}, @@ -74,7 +84,7 @@ y a, b, c d,e,f ,h, i -j, , +j, ,\x20 , , `, expectedRows: [][]string{ {"col1", "col2", "col3"}, @@ -89,7 +99,7 @@ j, , } for n, c := range cases { - rd, err := CreateReaderAndDetermineDelimiter(nil, strings.NewReader(c.csv)) + rd, err := CreateReaderAndDetermineDelimiter(nil, strings.NewReader(decodeSlashes(c.csv))) assert.NoError(t, err, "case %d: should not throw error: %v\n", n, err) assert.EqualValues(t, c.expectedDelimiter, rd.Comma, "case %d: delimiter should be '%c', got '%c'", n, c.expectedDelimiter, rd.Comma) rows, err := rd.ReadAll() @@ -222,7 +232,7 @@ John Doe john@doe.com This,note,had,a,lot,of,commas,to,test,delimters`, } for n, c := range cases { - delimiter := determineDelimiter(&markup.RenderContext{Filename: c.filename}, []byte(c.csv)) + delimiter := determineDelimiter(&markup.RenderContext{Filename: c.filename}, []byte(decodeSlashes(c.csv))) assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter) } } @@ -287,7 +297,7 @@ abc | |123 } for n, c := range cases { - modifiedText := removeQuotedString(c.text) + modifiedText := removeQuotedString(decodeSlashes(c.text)) assert.EqualValues(t, c.expectedText, modifiedText, "case %d: modified text should be equal", n) } } @@ -353,7 +363,7 @@ John Doe john@doe.com This,note,had,a,lot,of,commas,to,test,delimters`, quoted, text," a 2 "some, -quoted, +quoted,\t text," b 3 "some, quoted, @@ -442,7 +452,7 @@ jkl`, } for n, c := range cases { - delimiter := guessDelimiter([]byte(c.csv)) + delimiter := guessDelimiter([]byte(decodeSlashes(c.csv))) assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter) } } @@ -459,7 +469,7 @@ func TestGuessFromBeforeAfterQuotes(t *testing.T) { quoted, text," a 2 "some, -quoted, +quoted,\t text," b 3 "some, quoted, @@ -534,7 +544,7 @@ a|"he said, ""here I am"""`, } for n, c := range cases { - delimiter := guessFromBeforeAfterQuotes([]byte(c.csv)) + delimiter := guessFromBeforeAfterQuotes([]byte(decodeSlashes(c.csv))) assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter) } } From 9fad209b7ac77272aaa174a51036df99e484d873 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Jan 2022 00:18:12 +0800 Subject: [PATCH 3/7] Update routers/web/repo/migrate.go Co-authored-by: KN4CK3R --- routers/web/repo/migrate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index dc9a05e0651ba..68e2d6f5b9c71 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -82,7 +82,7 @@ func handleMigrateError(ctx *context.Context, owner *user_model.User, err error, ctx.RenderWithErr(ctx.Tr("form.2fa_auth_required"), tpl, form) case repo_model.IsErrReachLimitOfRepo(err): maxCreationLimit := ctx.User.MaxCreationLimit() - msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_1", maxCreationLimit) + msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_n", maxCreationLimit) ctx.RenderWithErr(msg, tpl, form) case repo_model.IsErrRepoAlreadyExist(err): ctx.Data["Err_RepoName"] = true From 1eb7379c04d1bac9ab891a7fcd84da877a5925ad Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Jan 2022 00:18:16 +0800 Subject: [PATCH 4/7] Update routers/web/repo/repo.go Co-authored-by: KN4CK3R --- routers/web/repo/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 1d074f886394b..fc44765a26686 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -163,7 +163,7 @@ func handleCreateError(ctx *context.Context, owner *user_model.User, err error, switch { case repo_model.IsErrReachLimitOfRepo(err): maxCreationLimit := ctx.User.MaxCreationLimit() - msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_1", maxCreationLimit) + msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_n", maxCreationLimit) ctx.RenderWithErr(msg, tpl, form) case repo_model.IsErrRepoAlreadyExist(err): ctx.Data["Err_RepoName"] = true From efd4f546347068282134ffe43395cf395482b4c7 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Jan 2022 00:18:20 +0800 Subject: [PATCH 5/7] Update routers/web/repo/setting.go Co-authored-by: KN4CK3R --- routers/web/repo/setting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index 9c9de2ee144cf..88e927e5bd19d 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -610,7 +610,7 @@ func SettingsPost(ctx *context.Context) { if !ctx.Repo.Owner.CanCreateRepo() { maxCreationLimit := ctx.User.MaxCreationLimit() - msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_1", maxCreationLimit) + msg := ctx.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_n", maxCreationLimit) ctx.Flash.Error(msg) ctx.Redirect(repo.Link() + "/settings") return From 906439b1478ccf1ce6498aa7fa9089f60bb339a9 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 2 Jan 2022 11:00:38 +0800 Subject: [PATCH 6/7] fix unit test --- modules/csv/csv_test.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index 4ea9b1e3f8d3a..1612a66953af6 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -22,13 +22,11 @@ func TestCreateReader(t *testing.T) { assert.Equal(t, ',', rd.Comma) } -func decodeSlashes(s string) string { +func decodeSlashes(t *testing.T, s string) string { s = strings.ReplaceAll(s, "\n", "\\n") s = strings.ReplaceAll(s, "\"", "\\\"") decoded, err := strconv.Unquote(`"` + s + `"`) - if err != nil { - panic("unable to decode string:" + err.Error() + "\n" + s) - } + assert.NoError(t, err, "unable to decode string") return decoded } @@ -99,7 +97,7 @@ j, ,\x20 } for n, c := range cases { - rd, err := CreateReaderAndDetermineDelimiter(nil, strings.NewReader(decodeSlashes(c.csv))) + rd, err := CreateReaderAndDetermineDelimiter(nil, strings.NewReader(decodeSlashes(t, c.csv))) assert.NoError(t, err, "case %d: should not throw error: %v\n", n, err) assert.EqualValues(t, c.expectedDelimiter, rd.Comma, "case %d: delimiter should be '%c', got '%c'", n, c.expectedDelimiter, rd.Comma) rows, err := rd.ReadAll() @@ -232,7 +230,7 @@ John Doe john@doe.com This,note,had,a,lot,of,commas,to,test,delimters`, } for n, c := range cases { - delimiter := determineDelimiter(&markup.RenderContext{Filename: c.filename}, []byte(decodeSlashes(c.csv))) + delimiter := determineDelimiter(&markup.RenderContext{Filename: c.filename}, []byte(decodeSlashes(t, c.csv))) assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter) } } @@ -297,7 +295,7 @@ abc | |123 } for n, c := range cases { - modifiedText := removeQuotedString(decodeSlashes(c.text)) + modifiedText := removeQuotedString(decodeSlashes(t, c.text)) assert.EqualValues(t, c.expectedText, modifiedText, "case %d: modified text should be equal", n) } } @@ -452,7 +450,7 @@ jkl`, } for n, c := range cases { - delimiter := guessDelimiter([]byte(decodeSlashes(c.csv))) + delimiter := guessDelimiter([]byte(decodeSlashes(t, c.csv))) assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter) } } @@ -544,7 +542,7 @@ a|"he said, ""here I am"""`, } for n, c := range cases { - delimiter := guessFromBeforeAfterQuotes([]byte(decodeSlashes(c.csv))) + delimiter := guessFromBeforeAfterQuotes([]byte(decodeSlashes(t, c.csv))) assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter) } } From b1bcc069b716ad10e8f9aded513478a5167b13b6 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 2 Jan 2022 11:05:33 +0800 Subject: [PATCH 7/7] add comments --- modules/translation/translation.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/translation/translation.go b/modules/translation/translation.go index aa5bd928d0f99..af1e5d25df53c 100644 --- a/modules/translation/translation.go +++ b/modules/translation/translation.go @@ -103,6 +103,7 @@ func (l *locale) Tr(format string, args ...interface{}) string { // Language specific rules for translating plural texts var trNLangRules = map[string]func(int64) int{ + // the default rule is "en-US" if a language isn't listed here "en-US": func(cnt int64) int { if cnt == 1 { return 0