From d55a0b723809f5b94acd948b924c8518014445e0 Mon Sep 17 00:00:00 2001 From: Gusted Date: Mon, 27 Jun 2022 22:58:46 +0200 Subject: [PATCH] Refactor `i18n` to `locale` (#20153) * Refactor `i18n` to `locale` - Currently we're using the `i18n` variable naming for the `locale` struct. This contains locale's specific information and cannot be used for general i18n purpose, therefore refactoring it to `locale` makes more sense. - Ref: https://github.com/go-gitea/gitea/pull/20096#discussion_r906699200 * Update routers/install/install.go --- modules/context/context.go | 2 +- routers/install/install.go | 2 +- routers/install/routes.go | 2 +- routers/web/base.go | 2 +- services/mailer/mail.go | 10 +- services/mailer/mail_release.go | 2 +- services/mailer/mail_repo.go | 2 +- templates/admin/auth/edit.tmpl | 178 ++++---- templates/admin/auth/list.tmpl | 16 +- templates/admin/auth/new.tmpl | 56 +-- templates/admin/auth/source/ldap.tmpl | 62 +-- templates/admin/auth/source/oauth.tmpl | 42 +- templates/admin/auth/source/smtp.tmpl | 26 +- templates/admin/auth/source/sspi.tmpl | 20 +- templates/admin/base/search.tmpl | 18 +- templates/admin/config.tmpl | 278 ++++++------ templates/admin/cron.tmpl | 20 +- templates/admin/dashboard.tmpl | 114 ++--- templates/admin/emails/list.tmpl | 34 +- templates/admin/hook_new.tmpl | 8 +- templates/admin/monitor.tmpl | 20 +- templates/admin/navbar.tmpl | 22 +- templates/admin/notice.tmpl | 26 +- templates/admin/org/list.tmpl | 16 +- templates/admin/packages/list.tmpl | 32 +- templates/admin/process-row.tmpl | 2 +- templates/admin/process.tmpl | 4 +- templates/admin/queue.tmpl | 102 ++--- templates/admin/repo/list.tmpl | 40 +- templates/admin/repo/search.tmpl | 30 +- templates/admin/repo/unadopted.tmpl | 30 +- templates/admin/stacktrace-row.tmpl | 2 +- templates/admin/stacktrace.tmpl | 10 +- templates/admin/user/edit.tmpl | 82 ++-- templates/admin/user/list.tmpl | 68 +-- templates/admin/user/new.tmpl | 36 +- templates/base/delete_modal_actions.tmpl | 4 +- templates/base/footer_content.tmpl | 16 +- templates/base/head.tmpl | 4 +- templates/base/head_navbar.tmpl | 70 +-- templates/base/head_script.tmpl | 8 +- templates/base/paginate.tmpl | 8 +- templates/explore/code.tmpl | 20 +- templates/explore/navbar.tmpl | 8 +- templates/explore/organizations.tmpl | 6 +- templates/explore/repo_list.tmpl | 14 +- templates/explore/repo_search.tmpl | 26 +- templates/explore/search.tmpl | 18 +- templates/explore/users.tmpl | 4 +- templates/home.tmpl | 18 +- templates/install.tmpl | 144 +++---- templates/mail/auth/activate.tmpl | 8 +- templates/mail/auth/activate_email.tmpl | 10 +- templates/mail/auth/register_notify.tmpl | 10 +- templates/mail/auth/reset_passwd.tmpl | 8 +- templates/mail/issue/assigned.tmpl | 6 +- templates/mail/issue/default.tmpl | 28 +- templates/mail/notify/collaborator.tmpl | 4 +- templates/mail/notify/repo_transfer.tmpl | 4 +- templates/mail/release.tmpl | 14 +- templates/org/create.tmpl | 22 +- templates/org/header.tmpl | 4 +- templates/org/home.tmpl | 20 +- templates/org/member/members.tmpl | 28 +- templates/org/menu.tmpl | 10 +- templates/org/settings/delete.tmpl | 12 +- templates/org/settings/hook_new.tmpl | 2 +- templates/org/settings/labels.tmpl | 4 +- templates/org/settings/navbar.tmpl | 10 +- templates/org/settings/options.tmpl | 40 +- templates/org/team/members.tmpl | 12 +- templates/org/team/navbar.tmpl | 4 +- templates/org/team/new.tmpl | 74 ++-- templates/org/team/repositories.tmpl | 20 +- templates/org/team/sidebar.tmpl | 42 +- templates/org/team/teams.tmpl | 12 +- templates/package/content/composer.tmpl | 18 +- .../content/composer_dependencies.tmpl | 4 +- templates/package/content/conan.tmpl | 12 +- templates/package/content/container.tmpl | 18 +- templates/package/content/generic.tmpl | 6 +- templates/package/content/helm.tmpl | 18 +- templates/package/content/maven.tmpl | 16 +- templates/package/content/npm.tmpl | 24 +- .../package/content/npm_dependencies.tmpl | 4 +- templates/package/content/nuget.tmpl | 18 +- templates/package/content/pypi.tmpl | 12 +- templates/package/content/rubygems.tmpl | 22 +- .../content/rubygems_dependencies.tmpl | 4 +- templates/package/metadata/composer.tmpl | 6 +- templates/package/metadata/conan.tmpl | 8 +- templates/package/metadata/container.tmpl | 12 +- templates/package/metadata/helm.tmpl | 4 +- templates/package/metadata/maven.tmpl | 4 +- templates/package/metadata/npm.tmpl | 8 +- templates/package/metadata/nuget.tmpl | 4 +- templates/package/metadata/pypi.tmpl | 6 +- templates/package/metadata/rubygems.tmpl | 6 +- templates/package/settings.tmpl | 26 +- templates/package/shared/list.tmpl | 20 +- templates/package/shared/versionlist.tmpl | 14 +- templates/package/view.tmpl | 20 +- templates/repo/activity.tmpl | 118 +++--- templates/repo/blame.tmpl | 18 +- templates/repo/branch/list.tmpl | 50 +-- templates/repo/branch_dropdown.tmpl | 26 +- templates/repo/clone_buttons.tmpl | 2 +- templates/repo/commit_page.tmpl | 88 ++-- templates/repo/commit_statuses.tmpl | 2 +- templates/repo/commits.tmpl | 2 +- templates/repo/commits_list.tmpl | 10 +- templates/repo/commits_table.tmpl | 12 +- templates/repo/create.tmpl | 104 ++--- templates/repo/diff/blob_excerpt.tmpl | 14 +- templates/repo/diff/box.tmpl | 62 +-- templates/repo/diff/comment_form.tmpl | 20 +- templates/repo/diff/comments.tmpl | 16 +- templates/repo/diff/compare.tmpl | 46 +- templates/repo/diff/conversation.tmpl | 16 +- templates/repo/diff/image_diff.tmpl | 22 +- templates/repo/diff/new_review.tmpl | 12 +- templates/repo/diff/options_dropdown.tmpl | 16 +- templates/repo/diff/section_split.tmpl | 20 +- templates/repo/diff/section_unified.tmpl | 6 +- templates/repo/diff/stats.tmpl | 2 +- templates/repo/diff/whitespace_dropdown.tmpl | 12 +- templates/repo/editor/cherry_pick.tmpl | 6 +- templates/repo/editor/commit_form.tmpl | 38 +- templates/repo/editor/edit.tmpl | 24 +- templates/repo/editor/patch.tmpl | 14 +- templates/repo/editor/upload.tmpl | 6 +- templates/repo/empty.tmpl | 14 +- templates/repo/find/files.tmpl | 2 +- templates/repo/forks.tmpl | 2 +- templates/repo/graph.tmpl | 10 +- templates/repo/header.tmpl | 66 +-- templates/repo/home.tmpl | 40 +- .../repo/issue/branch_selector_field.tmpl | 14 +- templates/repo/issue/choose.tmpl | 8 +- templates/repo/issue/comment_tab.tmpl | 6 +- templates/repo/issue/labels.tmpl | 2 +- .../repo/issue/labels/edit_delete_label.tmpl | 18 +- templates/repo/issue/labels/label_list.tmpl | 30 +- .../issue/labels/label_load_template.tmpl | 6 +- templates/repo/issue/labels/label_new.tmpl | 8 +- .../repo/issue/labels/labels_sidebar.tmpl | 2 +- templates/repo/issue/list.tmpl | 68 +-- templates/repo/issue/milestone_issues.tmpl | 58 +-- templates/repo/issue/milestone_new.tmpl | 28 +- templates/repo/issue/milestones.tmpl | 52 +-- templates/repo/issue/navbar.tmpl | 4 +- templates/repo/issue/new_form.tmpl | 62 +-- templates/repo/issue/openclose.tmpl | 4 +- templates/repo/issue/search.tmpl | 4 +- templates/repo/issue/view.tmpl | 4 +- templates/repo/issue/view_content.tmpl | 60 +-- .../repo/issue/view_content/add_reaction.tmpl | 2 +- .../repo/issue/view_content/attachments.tmpl | 4 +- .../repo/issue/view_content/comments.tmpl | 176 ++++---- .../view_content/comments_delete_time.tmpl | 8 +- .../repo/issue/view_content/context_menu.tmpl | 10 +- templates/repo/issue/view_content/pull.tmpl | 156 +++---- .../view_content/pull_merge_instruction.tmpl | 6 +- .../repo/issue/view_content/reactions.tmpl | 2 +- .../view_content/reference_issue_dialog.tmpl | 10 +- .../repo/issue/view_content/sidebar.tmpl | 188 ++++----- templates/repo/issue/view_title.tmpl | 44 +- templates/repo/migrate/codebase.tmpl | 36 +- templates/repo/migrate/git.tmpl | 26 +- templates/repo/migrate/gitbucket.tmpl | 42 +- templates/repo/migrate/gitea.tmpl | 40 +- templates/repo/migrate/github.tmpl | 42 +- templates/repo/migrate/gitlab.tmpl | 40 +- templates/repo/migrate/gogs.tmpl | 40 +- templates/repo/migrate/migrate.tmpl | 2 +- templates/repo/migrate/migrating.tmpl | 24 +- templates/repo/migrate/onedev.tmpl | 36 +- templates/repo/migrate/options.tmpl | 14 +- templates/repo/projects/list.tmpl | 38 +- templates/repo/projects/new.tmpl | 30 +- templates/repo/projects/view.tmpl | 72 ++-- templates/repo/pulls/commits.tmpl | 2 +- templates/repo/pulls/files.tmpl | 2 +- templates/repo/pulls/fork.tmpl | 20 +- templates/repo/pulls/status.tmpl | 16 +- templates/repo/pulls/tab_menu.tmpl | 6 +- templates/repo/release/list.tmpl | 44 +- templates/repo/release/new.tmpl | 56 +-- templates/repo/search.tmpl | 16 +- templates/repo/settings/branches.tmpl | 24 +- templates/repo/settings/collaboration.tmpl | 38 +- templates/repo/settings/deploy_keys.tmpl | 38 +- templates/repo/settings/githook_edit.tmpl | 10 +- templates/repo/settings/githooks.tmpl | 4 +- templates/repo/settings/lfs.tmpl | 22 +- templates/repo/settings/lfs_file.tmpl | 16 +- templates/repo/settings/lfs_file_find.tmpl | 10 +- templates/repo/settings/lfs_locks.tmpl | 16 +- templates/repo/settings/lfs_pointers.tmpl | 16 +- templates/repo/settings/nav.tmpl | 16 +- templates/repo/settings/navbar.tmpl | 16 +- templates/repo/settings/options.tmpl | 398 +++++++++--------- templates/repo/settings/protected_branch.tmpl | 92 ++-- templates/repo/settings/tags.tmpl | 34 +- .../repo/settings/webhook/base_list.tmpl | 24 +- .../repo/settings/webhook/delete_modal.tmpl | 8 +- templates/repo/settings/webhook/dingtalk.tmpl | 4 +- templates/repo/settings/webhook/discord.tmpl | 8 +- templates/repo/settings/webhook/feishu.tmpl | 6 +- templates/repo/settings/webhook/gitea.tmpl | 10 +- templates/repo/settings/webhook/gogs.tmpl | 8 +- templates/repo/settings/webhook/history.tmpl | 18 +- templates/repo/settings/webhook/matrix.tmpl | 10 +- templates/repo/settings/webhook/msteams.tmpl | 4 +- templates/repo/settings/webhook/new.tmpl | 2 +- .../repo/settings/webhook/packagist.tmpl | 8 +- templates/repo/settings/webhook/settings.tmpl | 104 ++--- templates/repo/settings/webhook/slack.tmpl | 12 +- templates/repo/settings/webhook/telegram.tmpl | 6 +- .../repo/settings/webhook/wechatwork.tmpl | 4 +- templates/repo/shabox_badge.tmpl | 6 +- templates/repo/sub_menu.tmpl | 8 +- templates/repo/unicode_escape_prompt.tmpl | 8 +- templates/repo/upload.tmpl | 8 +- templates/repo/user_cards.tmpl | 2 +- templates/repo/view_file.tmpl | 44 +- templates/repo/view_list.tmpl | 4 +- templates/repo/wiki/new.tmpl | 18 +- templates/repo/wiki/pages.tmpl | 8 +- templates/repo/wiki/revision.tmpl | 10 +- templates/repo/wiki/start.tmpl | 6 +- templates/repo/wiki/view.tmpl | 32 +- templates/shared/issuelist.tmpl | 20 +- templates/shared/searchbottom.tmpl | 2 +- templates/status/404.tmpl | 4 +- templates/status/500.tmpl | 6 +- templates/swagger/ui.tmpl | 2 +- templates/user/auth/activate.tmpl | 22 +- templates/user/auth/change_passwd_inner.tmpl | 8 +- templates/user/auth/finalize_openid.tmpl | 14 +- templates/user/auth/forgot_passwd.tmpl | 14 +- templates/user/auth/grant.tmpl | 10 +- templates/user/auth/grant_error.tmpl | 4 +- templates/user/auth/link_account.tmpl | 4 +- templates/user/auth/prohibit_login.tmpl | 4 +- templates/user/auth/reset_passwd.tmpl | 22 +- templates/user/auth/signin_inner.tmpl | 20 +- templates/user/auth/signin_navbar.tmpl | 2 +- templates/user/auth/signin_openid.tmpl | 6 +- templates/user/auth/signup_inner.tmpl | 22 +- .../user/auth/signup_openid_connect.tmpl | 12 +- templates/user/auth/signup_openid_navbar.tmpl | 4 +- .../user/auth/signup_openid_register.tmpl | 12 +- templates/user/auth/twofa.tmpl | 8 +- templates/user/auth/twofa_scratch.tmpl | 6 +- templates/user/auth/webauthn.tmpl | 10 +- templates/user/auth/webauthn_error.tmpl | 22 +- templates/user/dashboard/feeds.tmpl | 54 +-- templates/user/dashboard/issues.tmpl | 36 +- templates/user/dashboard/milestones.tmpl | 42 +- templates/user/dashboard/navbar.tmpl | 32 +- templates/user/dashboard/repolist.tmpl | 62 +-- templates/user/heatmap.tmpl | 2 +- .../user/notification/notification_div.tmpl | 18 +- templates/user/overview/header.tmpl | 4 +- templates/user/profile.tmpl | 24 +- templates/user/project.tmpl | 20 +- templates/user/settings/account.tmpl | 66 +-- templates/user/settings/appearance.tmpl | 44 +- templates/user/settings/applications.tmpl | 26 +- .../user/settings/applications_oauth2.tmpl | 20 +- .../settings/applications_oauth2_edit.tmpl | 24 +- templates/user/settings/grants_oauth2.tmpl | 12 +- templates/user/settings/keys_gpg.tmpl | 64 +-- templates/user/settings/keys_principal.tmpl | 24 +- templates/user/settings/keys_ssh.tmpl | 50 +-- templates/user/settings/navbar.tmpl | 16 +- templates/user/settings/organization.tmpl | 8 +- templates/user/settings/profile.tmpl | 60 +-- templates/user/settings/repos.tmpl | 34 +- .../user/settings/security/accountlinks.tmpl | 14 +- templates/user/settings/security/openid.tmpl | 18 +- templates/user/settings/security/twofa.tmpl | 22 +- .../user/settings/security/twofa_enroll.tmpl | 12 +- .../user/settings/security/webauthn.tmpl | 16 +- 285 files changed, 3668 insertions(+), 3668 deletions(-) diff --git a/modules/context/context.go b/modules/context/context.go index dcc43973ca..68f8a1b408 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -794,7 +794,7 @@ func Contexter() func(next http.Handler) http.Handler { ctx.Data["UnitPullsGlobalDisabled"] = unit.TypePullRequests.UnitGlobalDisabled() ctx.Data["UnitProjectsGlobalDisabled"] = unit.TypeProjects.UnitGlobalDisabled() - ctx.Data["i18n"] = locale + ctx.Data["locale"] = locale ctx.Data["AllLangs"] = translation.AllLangs() next.ServeHTTP(ctx.Resp, ctx.Req) diff --git a/routers/install/install.go b/routers/install/install.go index bf95cae1c6..27c3509fde 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -69,7 +69,7 @@ func Init(next http.Handler) http.Handler { Render: rnd, Session: session.GetSession(req), Data: map[string]interface{}{ - "i18n": locale, + "locale": locale, "Title": locale.Tr("install.install"), "PageIsInstall": true, "DbTypeNames": dbTypeNames, diff --git a/routers/install/routes.go b/routers/install/routes.go index e77081afe0..32829ede9e 100644 --- a/routers/install/routes.go +++ b/routers/install/routes.go @@ -57,7 +57,7 @@ func installRecovery() func(next http.Handler) http.Handler { store := dataStore{ "Language": lc.Language(), "CurrentURL": setting.AppSubURL + req.URL.RequestURI(), - "i18n": lc, + "locale": lc, "SignedUserID": int64(0), "SignedUserName": "", } diff --git a/routers/web/base.go b/routers/web/base.go index 5f817c77ce..c7ade55a61 100644 --- a/routers/web/base.go +++ b/routers/web/base.go @@ -139,7 +139,7 @@ func Recovery() func(next http.Handler) http.Handler { store := dataStore{ "Language": lc.Language(), "CurrentURL": setting.AppSubURL + req.URL.RequestURI(), - "i18n": lc, + "locale": lc, } user := context.GetContextUser(req) diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 52011ce352..b8d79bd818 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -80,7 +80,7 @@ func sendUserMail(language string, u *user_model.User, tpl base.TplName, code, s "Code": code, "Language": locale.Language(), // helper - "i18n": locale, + "locale": locale, "Str2html": templates.Str2html, "DotEscape": templates.DotEscape, } @@ -131,7 +131,7 @@ func SendActivateEmailMail(u *user_model.User, email *user_model.EmailAddress) { "Email": email.Email, "Language": locale.Language(), // helper - "i18n": locale, + "locale": locale, "Str2html": templates.Str2html, "DotEscape": templates.DotEscape, } @@ -162,7 +162,7 @@ func SendRegisterNotifyMail(u *user_model.User) { "Username": u.Name, "Language": locale.Language(), // helper - "i18n": locale, + "locale": locale, "Str2html": templates.Str2html, "DotEscape": templates.DotEscape, } @@ -196,7 +196,7 @@ func SendCollaboratorMail(u, doer *user_model.User, repo *repo_model.Repository) "Link": repo.HTMLURL(), "Language": locale.Language(), // helper - "i18n": locale, + "locale": locale, "Str2html": templates.Str2html, "DotEscape": templates.DotEscape, } @@ -281,7 +281,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient "ReviewComments": reviewComments, "Language": locale.Language(), // helper - "i18n": locale, + "locale": locale, "Str2html": templates.Str2html, "DotEscape": templates.DotEscape, } diff --git a/services/mailer/mail_release.go b/services/mailer/mail_release.go index b6bddeac04..dd9f78612c 100644 --- a/services/mailer/mail_release.go +++ b/services/mailer/mail_release.go @@ -75,7 +75,7 @@ func mailNewRelease(ctx context.Context, lang string, tos []string, rel *models. "Subject": subject, "Language": locale.Language(), // helper - "i18n": locale, + "locale": locale, "Str2html": templates.Str2html, "DotEscape": templates.DotEscape, } diff --git a/services/mailer/mail_repo.go b/services/mailer/mail_repo.go index 7f856f2d40..6fe9df0926 100644 --- a/services/mailer/mail_repo.go +++ b/services/mailer/mail_repo.go @@ -74,7 +74,7 @@ func sendRepoTransferNotifyMailPerLang(lang string, newOwner, doer *user_model.U "Language": locale.Language(), "Destination": destination, // helper - "i18n": locale, + "locale": locale, "Str2html": templates.Str2html, "DotEscape": templates.DotEscape, } diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 6e491d6cf4..af3f381c8e 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -4,7 +4,7 @@
{{template "base/alert" .}}

- {{.i18n.Tr "admin.auths.edit"}} + {{.locale.Tr "admin.auths.edit"}}

@@ -12,12 +12,12 @@ {{.CsrfTokenHtml}}
- + {{.Source.TypeName}}
- +
@@ -25,7 +25,7 @@ {{if or .Source.IsLDAP .Source.IsDLDAP}} {{ $cfg:=.Source.Cfg }}
- +
{{$cfg.SecurityProtocolName}}
@@ -38,74 +38,74 @@
- +
- +
- +
{{if .Source.IsLDAP}}
- +
- +
{{end}}
- +
{{if .Source.IsDLDAP}}
- +
{{end}}
- +
- +
- + -

{{.i18n.Tr "admin.auths.restricted_filter_helper"}}

+

{{.locale.Tr "admin.auths.restricted_filter_helper"}}

- - + +
- +
- +
- +
- +
- +
@@ -113,33 +113,33 @@
- +
- +
- +
- +
- +
- +
- +
@@ -148,31 +148,31 @@ {{if .Source.IsLDAP}}
- +
- +
- +
{{end}}
- + -

{{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}

+

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

- +
@@ -182,7 +182,7 @@ {{if .Source.IsSMTP}} {{ $cfg:=.Source.Cfg }}
- +
{{$cfg.Auth}}
@@ -195,47 +195,47 @@
- +
- +
- +
-

{{.i18n.Tr "admin.auths.force_smtps_helper"}}

+

{{.locale.Tr "admin.auths.force_smtps_helper"}}

- +
- + -

{{.i18n.Tr "admin.auths.helo_hostname_helper"}}

+

{{.locale.Tr "admin.auths.helo_hostname_helper"}}

- +
- + -

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

+

{{.locale.Tr "admin.auths.allowed_domains_helper"}}

- + -

{{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}

+

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

{{end}} @@ -244,18 +244,18 @@ {{if .Source.IsPAM}} {{ $cfg:=.Source.Cfg }}
- +
- +
- + -

{{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}

+

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

{{end}} @@ -264,7 +264,7 @@ {{if .Source.IsOAuth2}} {{ $cfg:=.Source.Cfg }}
- +
{{.CurrentOAuth2Provider.DisplayName}}
@@ -277,52 +277,52 @@
- +
- +
- +
- +
- + -

{{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}

+

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

- +
- +
- +
- +
- +
- +
@@ -336,29 +336,29 @@ {{end}}{{end}}
- +
- + -

{{.i18n.Tr "admin.auths.oauth2_required_claim_name_helper"}}

+

{{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}

- + -

{{.i18n.Tr "admin.auths.oauth2_required_claim_value_helper"}}

+

{{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}

- +
- +
- +
{{end}} @@ -368,32 +368,32 @@ {{ $cfg:=.Source.Cfg }}
- + -

{{.i18n.Tr "admin.auths.sspi_auto_create_users_helper"}}

+

{{.locale.Tr "admin.auths.sspi_auto_create_users_helper"}}

- + -

{{.i18n.Tr "admin.auths.sspi_auto_activate_users_helper"}}

+

{{.locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}

- + -

{{.i18n.Tr "admin.auths.sspi_strip_domain_names_helper"}}

+

{{.locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}

- + -

{{.i18n.Tr "admin.auths.sspi_separator_replacement_helper"}}

+

{{.locale.Tr "admin.auths.sspi_separator_replacement_helper"}}

- +
-

{{.i18n.Tr "admin.auths.sspi_default_language_helper"}}

+

{{.locale.Tr "admin.auths.sspi_default_language_helper"}}

{{end}} {{if .Source.IsLDAP}}
- +
{{end}}
- +
- -
{{.i18n.Tr "admin.auths.delete"}}
+ +
{{.locale.Tr "admin.auths.delete"}}
@@ -435,10 +435,10 @@
{{svg "octicon-trash"}} - {{.i18n.Tr "admin.auths.delete_auth_title"}} + {{.locale.Tr "admin.auths.delete_auth_title"}}
-

{{.i18n.Tr "admin.auths.delete_auth_desc"}}

+

{{.locale.Tr "admin.auths.delete_auth_desc"}}

{{template "base/delete_modal_actions" .}}
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index f1b4da35eb..3ce138449d 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -4,9 +4,9 @@
{{template "base/alert" .}}

- {{.i18n.Tr "admin.auths.auth_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) + {{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
- {{.i18n.Tr "admin.auths.new"}} + {{.locale.Tr "admin.auths.new"}}

@@ -14,12 +14,12 @@ ID - {{.i18n.Tr "admin.auths.name"}} - {{.i18n.Tr "admin.auths.type"}} - {{.i18n.Tr "admin.auths.enabled"}} - {{.i18n.Tr "admin.auths.updated"}} - {{.i18n.Tr "admin.users.created"}} - {{.i18n.Tr "admin.users.edit"}} + {{.locale.Tr "admin.auths.name"}} + {{.locale.Tr "admin.auths.type"}} + {{.locale.Tr "admin.auths.enabled"}} + {{.locale.Tr "admin.auths.updated"}} + {{.locale.Tr "admin.users.created"}} + {{.locale.Tr "admin.users.edit"}} diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 9882cde03b..6bfda9fcd3 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -4,7 +4,7 @@
{{template "base/alert" .}}

- {{.i18n.Tr "admin.auths.new"}} + {{.locale.Tr "admin.auths.new"}}

@@ -12,7 +12,7 @@ {{.CsrfTokenHtml}}
- +
{{.CurrentTypeName}}
@@ -25,7 +25,7 @@
- +
@@ -37,16 +37,16 @@
- + - +
- + -

{{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}

+

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

@@ -58,67 +58,67 @@
- +
- +
- +
- +

- {{.i18n.Tr "admin.auths.tips"}} + {{.locale.Tr "admin.auths.tips"}}

GMail Settings:

Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true

-
{{.i18n.Tr "admin.auths.tips.oauth2.general"}}:
-

{{.i18n.Tr "admin.auths.tips.oauth2.general.tip"}}

+
{{.locale.Tr "admin.auths.tips.oauth2.general"}}:
+

{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}

-
{{.i18n.Tr "admin.auths.tip.oauth2_provider"}}
+
{{.locale.Tr "admin.auths.tip.oauth2_provider"}}
  • Bitbucket
    • - {{.i18n.Tr "admin.auths.tip.bitbucket"}} + {{.locale.Tr "admin.auths.tip.bitbucket"}}
  • Dropbox
    • - {{.i18n.Tr "admin.auths.tip.dropbox"}} + {{.locale.Tr "admin.auths.tip.dropbox"}}
  • Facebook
    • - {{.i18n.Tr "admin.auths.tip.facebook"}} + {{.locale.Tr "admin.auths.tip.facebook"}}
  • GitHub
    • - {{.i18n.Tr "admin.auths.tip.github"}} + {{.locale.Tr "admin.auths.tip.github"}}
  • GitLab
    • - {{.i18n.Tr "admin.auths.tip.gitlab"}} + {{.locale.Tr "admin.auths.tip.gitlab"}}
  • Google
    • - {{.i18n.Tr "admin.auths.tip.google_plus"}} + {{.locale.Tr "admin.auths.tip.google_plus"}}
  • OpenID Connect
    • - {{.i18n.Tr "admin.auths.tip.openid_connect"}} + {{.locale.Tr "admin.auths.tip.openid_connect"}}
  • Twitter
    • - {{.i18n.Tr "admin.auths.tip.twitter"}} + {{.locale.Tr "admin.auths.tip.twitter"}}
  • Discord
    • - {{.i18n.Tr "admin.auths.tip.discord"}} + {{.locale.Tr "admin.auths.tip.discord"}}
  • Gitea
    • - {{.i18n.Tr "admin.auths.tip.gitea"}} + {{.locale.Tr "admin.auths.tip.gitea"}}
  • Nextcloud
    • - {{.i18n.Tr "admin.auths.tip.nextcloud"}} + {{.locale.Tr "admin.auths.tip.nextcloud"}}
  • Yandex
    • - {{.i18n.Tr "admin.auths.tip.yandex"}} + {{.locale.Tr "admin.auths.tip.yandex"}}
  • Mastodon
    • - {{.i18n.Tr "admin.auths.tip.mastodon"}} + {{.locale.Tr "admin.auths.tip.mastodon"}}
    diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl index afdfbadd65..b44eb799b9 100644 --- a/templates/admin/auth/source/ldap.tmpl +++ b/templates/admin/auth/source/ldap.tmpl @@ -1,6 +1,6 @@
    - +
    {{.CurrentSecurityProtocol}}
    @@ -13,103 +13,103 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - + -

    {{.i18n.Tr "admin.auths.restricted_filter_helper"}}

    +

    {{.locale.Tr "admin.auths.restricted_filter_helper"}}

    - - + +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -117,24 +117,24 @@
    - +
    - +
    - + -

    {{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}

    +

    {{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

    - +
    diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index 3991dc2170..166373a324 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -1,6 +1,6 @@
    - +
    {{.oauth2_provider}}
    @@ -13,53 +13,53 @@
    - +
    - +
    - +
    - +
    - + -

    {{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}

    +

    {{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

    - +
    - +
    - +
    - +
    - +
    - +
    @@ -73,29 +73,29 @@ {{end}}{{end}}
    - +
    - + -

    {{.i18n.Tr "admin.auths.oauth2_required_claim_name_helper"}}

    +

    {{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}

    - + -

    {{.i18n.Tr "admin.auths.oauth2_required_claim_value_helper"}}

    +

    {{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}

    - +
    - +
    - +
    diff --git a/templates/admin/auth/source/smtp.tmpl b/templates/admin/auth/source/smtp.tmpl index 8572d6dc56..2d577412c1 100644 --- a/templates/admin/auth/source/smtp.tmpl +++ b/templates/admin/auth/source/smtp.tmpl @@ -1,6 +1,6 @@
    - +
    {{.smtp_auth}}
    @@ -13,47 +13,47 @@
    - +
    - +
    - + -

    {{.i18n.Tr "admin.auths.force_smtps_helper"}}

    +

    {{.locale.Tr "admin.auths.force_smtps_helper"}}

    - +
    - + -

    {{.i18n.Tr "admin.auths.helo_hostname_helper"}}

    +

    {{.locale.Tr "admin.auths.helo_hostname_helper"}}

    - +
    - + -

    {{.i18n.Tr "admin.auths.allowed_domains_helper"}}

    +

    {{.locale.Tr "admin.auths.allowed_domains_helper"}}

    - + -

    {{.i18n.Tr "admin.auths.skip_local_two_fa_helper"}}

    +

    {{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

    diff --git a/templates/admin/auth/source/sspi.tmpl b/templates/admin/auth/source/sspi.tmpl index 91697ef9c5..dee40d9fd5 100644 --- a/templates/admin/auth/source/sspi.tmpl +++ b/templates/admin/auth/source/sspi.tmpl @@ -1,32 +1,32 @@
    - + -

    {{.i18n.Tr "admin.auths.sspi_auto_create_users_helper"}}

    +

    {{.locale.Tr "admin.auths.sspi_auto_create_users_helper"}}

    - + -

    {{.i18n.Tr "admin.auths.sspi_auto_activate_users_helper"}}

    +

    {{.locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}

    - + -

    {{.i18n.Tr "admin.auths.sspi_strip_domain_names_helper"}}

    +

    {{.locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}

    - + -

    {{.i18n.Tr "admin.auths.sspi_separator_replacement_helper"}}

    +

    {{.locale.Tr "admin.auths.sspi_separator_replacement_helper"}}

    - +
    -

    {{.i18n.Tr "admin.auths.sspi_default_language_helper"}}

    +

    {{.locale.Tr "admin.auths.sspi_default_language_helper"}}

    diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index 4ec62c162c..28bc478f6a 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -2,22 +2,22 @@
    - {{.i18n.Tr "repo.issues.filter_sort"}} + {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.latest"}} + {{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}}
    - - + +
    diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 2a27baf535..a55a797262 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -4,50 +4,50 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "admin.config.server_config"}} + {{.locale.Tr "admin.config.server_config"}}

    -
    {{.i18n.Tr "admin.config.app_name"}}
    +
    {{.locale.Tr "admin.config.app_name"}}
    {{AppName}}
    -
    {{.i18n.Tr "admin.config.app_ver"}}
    +
    {{.locale.Tr "admin.config.app_ver"}}
    {{AppVer}}{{AppBuiltWith}}
    -
    {{.i18n.Tr "admin.config.custom_conf"}}
    +
    {{.locale.Tr "admin.config.custom_conf"}}
    {{.CustomConf}}
    -
    {{.i18n.Tr "admin.config.app_url"}}
    +
    {{.locale.Tr "admin.config.app_url"}}
    {{.AppUrl}}
    -
    {{.i18n.Tr "admin.config.domain"}}
    +
    {{.locale.Tr "admin.config.domain"}}
    {{.Domain}}
    -
    {{.i18n.Tr "admin.config.offline_mode"}}
    +
    {{.locale.Tr "admin.config.offline_mode"}}
    {{if .OfflineMode}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.disable_router_log"}}
    +
    {{.locale.Tr "admin.config.disable_router_log"}}
    {{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.run_user"}}
    +
    {{.locale.Tr "admin.config.run_user"}}
    {{.RunUser}}
    -
    {{.i18n.Tr "admin.config.run_mode"}}
    +
    {{.locale.Tr "admin.config.run_mode"}}
    {{.RunMode}}
    -
    {{.i18n.Tr "admin.config.git_version"}}
    +
    {{.locale.Tr "admin.config.git_version"}}
    {{.GitVersion}}
    -
    {{.i18n.Tr "admin.config.repo_root_path"}}
    +
    {{.locale.Tr "admin.config.repo_root_path"}}
    {{.RepoRootPath}}
    -
    {{.i18n.Tr "admin.config.static_file_root_path"}}
    +
    {{.locale.Tr "admin.config.static_file_root_path"}}
    {{.StaticRootPath}}
    -
    {{.i18n.Tr "admin.config.custom_file_root_path"}}
    +
    {{.locale.Tr "admin.config.custom_file_root_path"}}
    {{.CustomRootPath}}
    -
    {{.i18n.Tr "admin.config.log_file_root_path"}}
    +
    {{.locale.Tr "admin.config.log_file_root_path"}}
    {{.LogRootPath}}
    -
    {{.i18n.Tr "admin.config.script_type"}}
    +
    {{.locale.Tr "admin.config.script_type"}}
    {{.ScriptType}}
    -
    {{.i18n.Tr "admin.config.reverse_auth_user"}}
    +
    {{.locale.Tr "admin.config.reverse_auth_user"}}
    {{.ReverseProxyAuthUser}}
    {{if .EnvVars }} @@ -62,33 +62,33 @@

    - {{.i18n.Tr "admin.config.ssh_config"}} + {{.locale.Tr "admin.config.ssh_config"}}

    -
    {{.i18n.Tr "admin.config.ssh_enabled"}}
    +
    {{.locale.Tr "admin.config.ssh_enabled"}}
    {{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    {{if not .SSH.Disabled}} -
    {{.i18n.Tr "admin.config.ssh_start_builtin_server"}}
    +
    {{.locale.Tr "admin.config.ssh_start_builtin_server"}}
    {{if .SSH.StartBuiltinServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.ssh_domain"}}
    +
    {{.locale.Tr "admin.config.ssh_domain"}}
    {{.SSH.Domain}}
    -
    {{.i18n.Tr "admin.config.ssh_port"}}
    +
    {{.locale.Tr "admin.config.ssh_port"}}
    {{.SSH.Port}}
    -
    {{.i18n.Tr "admin.config.ssh_listen_port"}}
    +
    {{.locale.Tr "admin.config.ssh_listen_port"}}
    {{.SSH.ListenPort}}
    {{if not .SSH.StartBuiltinServer}} -
    {{.i18n.Tr "admin.config.ssh_root_path"}}
    +
    {{.locale.Tr "admin.config.ssh_root_path"}}
    {{.SSH.RootPath}}
    -
    {{.i18n.Tr "admin.config.ssh_key_test_path"}}
    +
    {{.locale.Tr "admin.config.ssh_key_test_path"}}
    {{.SSH.KeyTestPath}}
    -
    {{.i18n.Tr "admin.config.ssh_keygen_path"}}
    +
    {{.locale.Tr "admin.config.ssh_keygen_path"}}
    {{.SSH.KeygenPath}}
    -
    {{.i18n.Tr "admin.config.ssh_minimum_key_size_check"}}
    +
    {{.locale.Tr "admin.config.ssh_minimum_key_size_check"}}
    {{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    {{if .SSH.MinimumKeySizeCheck}} -
    {{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}
    +
    {{.locale.Tr "admin.config.ssh_minimum_key_sizes"}}
    {{.SSH.MinimumKeySizes}}
    {{end}} {{end}} @@ -97,304 +97,304 @@

    - {{.i18n.Tr "admin.config.lfs_config"}} + {{.locale.Tr "admin.config.lfs_config"}}

    -
    {{.i18n.Tr "admin.config.lfs_enabled"}}
    +
    {{.locale.Tr "admin.config.lfs_enabled"}}
    {{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    {{if .LFS.StartServer}} -
    {{.i18n.Tr "admin.config.lfs_content_path"}}
    +
    {{.locale.Tr "admin.config.lfs_content_path"}}
    {{.LFS.Path}}
    -
    {{.i18n.Tr "admin.config.lfs_http_auth_expiry"}}
    +
    {{.locale.Tr "admin.config.lfs_http_auth_expiry"}}
    {{.LFS.HTTPAuthExpiry}}
    {{end}}

    - {{.i18n.Tr "admin.config.db_config"}} + {{.locale.Tr "admin.config.db_config"}}

    -
    {{.i18n.Tr "admin.config.db_type"}}
    +
    {{.locale.Tr "admin.config.db_type"}}
    {{.DbCfg.Type}}
    {{if not (eq .DbCfg.Type "sqlite3")}} -
    {{.i18n.Tr "admin.config.db_host"}}
    +
    {{.locale.Tr "admin.config.db_host"}}
    {{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}
    -
    {{.i18n.Tr "admin.config.db_name"}}
    +
    {{.locale.Tr "admin.config.db_name"}}
    {{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}
    -
    {{.i18n.Tr "admin.config.db_user"}}
    +
    {{.locale.Tr "admin.config.db_user"}}
    {{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}
    {{end}} {{if eq .DbCfg.Type "postgres"}} -
    {{.i18n.Tr "admin.config.db_schema"}}
    +
    {{.locale.Tr "admin.config.db_schema"}}
    {{if .DbCfg.Schema}}{{.DbCfg.Schema}}{{else}}-{{end}}
    -
    {{.i18n.Tr "admin.config.db_ssl_mode"}}
    +
    {{.locale.Tr "admin.config.db_ssl_mode"}}
    {{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}
    {{end}} {{if eq .DbCfg.Type "sqlite3"}} -
    {{.i18n.Tr "admin.config.db_path"}}
    +
    {{.locale.Tr "admin.config.db_path"}}
    {{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}
    {{end}}

    - {{.i18n.Tr "admin.config.service_config"}} + {{.locale.Tr "admin.config.service_config"}}

    -
    {{.i18n.Tr "admin.config.register_email_confirm"}}
    +
    {{.locale.Tr "admin.config.register_email_confirm"}}
    {{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.disable_register"}}
    +
    {{.locale.Tr "admin.config.disable_register"}}
    {{if .Service.DisableRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.allow_only_internal_registration"}}
    +
    {{.locale.Tr "admin.config.allow_only_internal_registration"}}
    {{if .Service.AllowOnlyInternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.allow_only_external_registration"}}
    +
    {{.locale.Tr "admin.config.allow_only_external_registration"}}
    {{if .Service.AllowOnlyExternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.show_registration_button"}}
    +
    {{.locale.Tr "admin.config.show_registration_button"}}
    {{if .Service.ShowRegistrationButton}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.enable_openid_signup"}}
    +
    {{.locale.Tr "admin.config.enable_openid_signup"}}
    {{if .Service.EnableOpenIDSignUp}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.enable_openid_signin"}}
    +
    {{.locale.Tr "admin.config.enable_openid_signin"}}
    {{if .Service.EnableOpenIDSignIn}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.require_sign_in_view"}}
    +
    {{.locale.Tr "admin.config.require_sign_in_view"}}
    {{if .Service.RequireSignInView}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.mail_notify"}}
    +
    {{.locale.Tr "admin.config.mail_notify"}}
    {{if .Service.EnableNotifyMail}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.disable_key_size_check"}}
    +
    {{.locale.Tr "admin.config.disable_key_size_check"}}
    {{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.enable_captcha"}}
    +
    {{.locale.Tr "admin.config.enable_captcha"}}
    {{if .Service.EnableCaptcha}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.default_keep_email_private"}}
    +
    {{.locale.Tr "admin.config.default_keep_email_private"}}
    {{if .Service.DefaultKeepEmailPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.default_allow_create_organization"}}
    +
    {{.locale.Tr "admin.config.default_allow_create_organization"}}
    {{if .Service.DefaultAllowCreateOrganization}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.enable_timetracking"}}
    +
    {{.locale.Tr "admin.config.enable_timetracking"}}
    {{if .Service.EnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    {{if .Service.EnableTimetracking}} -
    {{.i18n.Tr "admin.config.default_enable_timetracking"}}
    +
    {{.locale.Tr "admin.config.default_enable_timetracking"}}
    {{if .Service.DefaultEnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.default_allow_only_contributors_to_track_time"}}
    +
    {{.locale.Tr "admin.config.default_allow_only_contributors_to_track_time"}}
    {{if .Service.DefaultAllowOnlyContributorsToTrackTime}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    {{end}} -
    {{.i18n.Tr "admin.config.default_visibility_organization"}}
    +
    {{.locale.Tr "admin.config.default_visibility_organization"}}
    {{.Service.DefaultOrgVisibility}}
    -
    {{.i18n.Tr "admin.config.no_reply_address"}}
    +
    {{.locale.Tr "admin.config.no_reply_address"}}
    {{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}
    -
    {{.i18n.Tr "admin.config.default_enable_dependencies"}}
    +
    {{.locale.Tr "admin.config.default_enable_dependencies"}}
    {{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.active_code_lives"}}
    -
    {{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
    -
    {{.i18n.Tr "admin.config.reset_password_code_lives"}}
    -
    {{.Service.ResetPwdCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
    +
    {{.locale.Tr "admin.config.active_code_lives"}}
    +
    {{.Service.ActiveCodeLives}} {{.locale.Tr "tool.raw_minutes"}}
    +
    {{.locale.Tr "admin.config.reset_password_code_lives"}}
    +
    {{.Service.ResetPwdCodeLives}} {{.locale.Tr "tool.raw_minutes"}}

    - {{.i18n.Tr "admin.config.webhook_config"}} + {{.locale.Tr "admin.config.webhook_config"}}

    -
    {{.i18n.Tr "admin.config.queue_length"}}
    +
    {{.locale.Tr "admin.config.queue_length"}}
    {{.Webhook.QueueLength}}
    -
    {{.i18n.Tr "admin.config.deliver_timeout"}}
    -
    {{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}
    -
    {{.i18n.Tr "admin.config.skip_tls_verify"}}
    +
    {{.locale.Tr "admin.config.deliver_timeout"}}
    +
    {{.Webhook.DeliverTimeout}} {{.locale.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.skip_tls_verify"}}
    {{if .Webhook.SkipTLSVerify}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}

    - {{.i18n.Tr "admin.config.mailer_config"}} + {{.locale.Tr "admin.config.mailer_config"}}

    -
    {{.i18n.Tr "admin.config.mailer_enabled"}}
    +
    {{.locale.Tr "admin.config.mailer_enabled"}}
    {{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    {{if .MailerEnabled}} -
    {{.i18n.Tr "admin.config.mailer_name"}}
    +
    {{.locale.Tr "admin.config.mailer_name"}}
    {{.Mailer.Name}}
    {{if eq .Mailer.MailerType "smtp"}} -
    {{.i18n.Tr "admin.config.mailer_disable_helo"}}
    +
    {{.locale.Tr "admin.config.mailer_disable_helo"}}
    {{if .DisableHelo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.mailer_host"}}
    +
    {{.locale.Tr "admin.config.mailer_host"}}
    {{.Mailer.Host}}
    {{else if eq .Mailer.MailerType "sendmail"}} -
    {{.i18n.Tr "admin.config.mailer_use_sendmail"}}
    +
    {{.locale.Tr "admin.config.mailer_use_sendmail"}}
    {{svg "octicon-check"}}
    -
    {{.i18n.Tr "admin.config.mailer_sendmail_path"}}
    +
    {{.locale.Tr "admin.config.mailer_sendmail_path"}}
    {{.Mailer.SendmailPath}}
    -
    {{.i18n.Tr "admin.config.mailer_sendmail_args"}}
    +
    {{.locale.Tr "admin.config.mailer_sendmail_args"}}
    {{.Mailer.SendmailArgs}}
    -
    {{.i18n.Tr "admin.config.mailer_sendmail_timeout"}}
    -
    {{.Mailer.SendmailTimeout}} {{.i18n.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.mailer_sendmail_timeout"}}
    +
    {{.Mailer.SendmailTimeout}} {{.locale.Tr "tool.raw_seconds"}}
    {{end}} -
    {{.i18n.Tr "admin.config.mailer_user"}}
    +
    {{.locale.Tr "admin.config.mailer_user"}}
    {{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}

    {{.CsrfTokenHtml}}
    - +
    - +
    {{end}}

    - {{.i18n.Tr "admin.config.cache_config"}} + {{.locale.Tr "admin.config.cache_config"}}

    -
    {{.i18n.Tr "admin.config.cache_adapter"}}
    +
    {{.locale.Tr "admin.config.cache_adapter"}}
    {{.CacheAdapter}}
    {{if eq .CacheAdapter "memory"}} -
    {{.i18n.Tr "admin.config.cache_interval"}}
    -
    {{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.cache_interval"}}
    +
    {{.CacheInterval}} {{.locale.Tr "tool.raw_seconds"}}
    {{end}} {{if .CacheConn}} -
    {{.i18n.Tr "admin.config.cache_conn"}}
    +
    {{.locale.Tr "admin.config.cache_conn"}}
    {{.CacheConn}}
    -
    {{.i18n.Tr "admin.config.cache_item_ttl"}}
    +
    {{.locale.Tr "admin.config.cache_item_ttl"}}
    {{.CacheItemTTL}}
    {{end}}

    - {{.i18n.Tr "admin.config.session_config"}} + {{.locale.Tr "admin.config.session_config"}}

    -
    {{.i18n.Tr "admin.config.session_provider"}}
    +
    {{.locale.Tr "admin.config.session_provider"}}
    {{.SessionConfig.Provider}}
    -
    {{.i18n.Tr "admin.config.provider_config"}}
    +
    {{.locale.Tr "admin.config.provider_config"}}
    {{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig}}{{else}}-{{end}}
    -
    {{.i18n.Tr "admin.config.cookie_name"}}
    +
    {{.locale.Tr "admin.config.cookie_name"}}
    {{.SessionConfig.CookieName}}
    -
    {{.i18n.Tr "admin.config.gc_interval_time"}}
    -
    {{.SessionConfig.Gclifetime}} {{.i18n.Tr "tool.raw_seconds"}}
    -
    {{.i18n.Tr "admin.config.session_life_time"}}
    -
    {{.SessionConfig.Maxlifetime}} {{.i18n.Tr "tool.raw_seconds"}}
    -
    {{.i18n.Tr "admin.config.https_only"}}
    +
    {{.locale.Tr "admin.config.gc_interval_time"}}
    +
    {{.SessionConfig.Gclifetime}} {{.locale.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.session_life_time"}}
    +
    {{.SessionConfig.Maxlifetime}} {{.locale.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.https_only"}}
    {{if .SessionConfig.Secure}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}

    - {{.i18n.Tr "admin.config.picture_config"}} + {{.locale.Tr "admin.config.picture_config"}}

    -
    {{.i18n.Tr "admin.config.disable_gravatar"}}
    +
    {{.locale.Tr "admin.config.disable_gravatar"}}
    {{if .DisableGravatar}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.enable_federated_avatar"}}
    +
    {{.locale.Tr "admin.config.enable_federated_avatar"}}
    {{if .EnableFederatedAvatar}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}

    - {{.i18n.Tr "admin.config.git_config"}} + {{.locale.Tr "admin.config.git_config"}}

    -
    {{.i18n.Tr "admin.config.git_disable_diff_highlight"}}
    +
    {{.locale.Tr "admin.config.git_disable_diff_highlight"}}
    {{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    -
    {{.i18n.Tr "admin.config.git_max_diff_lines"}}
    +
    {{.locale.Tr "admin.config.git_max_diff_lines"}}
    {{.Git.MaxGitDiffLines}}
    -
    {{.i18n.Tr "admin.config.git_max_diff_line_characters"}}
    +
    {{.locale.Tr "admin.config.git_max_diff_line_characters"}}
    {{.Git.MaxGitDiffLineCharacters}}
    -
    {{.i18n.Tr "admin.config.git_max_diff_files"}}
    +
    {{.locale.Tr "admin.config.git_max_diff_files"}}
    {{.Git.MaxGitDiffFiles}}
    -
    {{.i18n.Tr "admin.config.git_gc_args"}}
    +
    {{.locale.Tr "admin.config.git_gc_args"}}
    {{.Git.GCArgs}}
    -
    {{.i18n.Tr "admin.config.git_migrate_timeout"}}
    -
    {{.Git.Timeout.Migrate}} {{.i18n.Tr "tool.raw_seconds"}}
    -
    {{.i18n.Tr "admin.config.git_mirror_timeout"}}
    -
    {{.Git.Timeout.Mirror}} {{.i18n.Tr "tool.raw_seconds"}}
    -
    {{.i18n.Tr "admin.config.git_clone_timeout"}}
    -
    {{.Git.Timeout.Clone}} {{.i18n.Tr "tool.raw_seconds"}}
    -
    {{.i18n.Tr "admin.config.git_pull_timeout"}}
    -
    {{.Git.Timeout.Pull}} {{.i18n.Tr "tool.raw_seconds"}}
    -
    {{.i18n.Tr "admin.config.git_gc_timeout"}}
    -
    {{.Git.Timeout.GC}} {{.i18n.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.git_migrate_timeout"}}
    +
    {{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.git_mirror_timeout"}}
    +
    {{.Git.Timeout.Mirror}} {{.locale.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.git_clone_timeout"}}
    +
    {{.Git.Timeout.Clone}} {{.locale.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.git_pull_timeout"}}
    +
    {{.Git.Timeout.Pull}} {{.locale.Tr "tool.raw_seconds"}}
    +
    {{.locale.Tr "admin.config.git_gc_timeout"}}
    +
    {{.Git.Timeout.GC}} {{.locale.Tr "tool.raw_seconds"}}

    - {{.i18n.Tr "admin.config.log_config"}} + {{.locale.Tr "admin.config.log_config"}}

    {{range .Loggers.default.SubLogDescriptions}} -
    {{$.i18n.Tr "admin.config.log_mode"}}
    +
    {{$.locale.Tr "admin.config.log_mode"}}
    {{.Name}} ({{.Provider}})
    -
    {{$.i18n.Tr "admin.config.log_config"}}
    +
    {{$.locale.Tr "admin.config.log_config"}}
    {{.Config | JsonPrettyPrint}}
    {{end}}
    -
    {{$.i18n.Tr "admin.config.router_log_mode"}}
    +
    {{$.locale.Tr "admin.config.router_log_mode"}}
    {{if .DisableRouterLog}} -
    {{$.i18n.Tr "admin.config.disabled_logger"}}
    +
    {{$.locale.Tr "admin.config.disabled_logger"}}
    {{else}} {{if .Loggers.router.SubLogDescriptions}} -
    {{$.i18n.Tr "admin.config.own_named_logger"}}
    +
    {{$.locale.Tr "admin.config.own_named_logger"}}
    {{range .Loggers.router.SubLogDescriptions}} -
    {{$.i18n.Tr "admin.config.log_mode"}}
    +
    {{$.locale.Tr "admin.config.log_mode"}}
    {{.Name}} ({{.Provider}})
    -
    {{$.i18n.Tr "admin.config.log_config"}}
    +
    {{$.locale.Tr "admin.config.log_config"}}
    {{.Config | JsonPrettyPrint}}
    {{end}} {{else}} -
    {{$.i18n.Tr "admin.config.routes_to_default_logger"}}
    +
    {{$.locale.Tr "admin.config.routes_to_default_logger"}}
    {{end}} {{end}}
    -
    {{$.i18n.Tr "admin.config.access_log_mode"}}
    +
    {{$.locale.Tr "admin.config.access_log_mode"}}
    {{if .EnableAccessLog}} {{if .Loggers.access.SubLogDescriptions}} -
    {{$.i18n.Tr "admin.config.own_named_logger"}}
    +
    {{$.locale.Tr "admin.config.own_named_logger"}}
    {{range .Loggers.access.SubLogDescriptions}} -
    {{$.i18n.Tr "admin.config.log_mode"}}
    +
    {{$.locale.Tr "admin.config.log_mode"}}
    {{.Name}} ({{.Provider}})
    -
    {{$.i18n.Tr "admin.config.log_config"}}
    +
    {{$.locale.Tr "admin.config.log_config"}}
    {{.Config | JsonPrettyPrint}}
    {{end}} {{else}} -
    {{$.i18n.Tr "admin.config.routes_to_default_logger"}}
    +
    {{$.locale.Tr "admin.config.routes_to_default_logger"}}
    {{end}} -
    {{$.i18n.Tr "admin.config.access_log_template"}}
    +
    {{$.locale.Tr "admin.config.access_log_template"}}
    {{$.AccessLogTemplate}}
    {{else}} -
    {{$.i18n.Tr "admin.config.disabled_logger"}}
    +
    {{$.locale.Tr "admin.config.disabled_logger"}}
    {{end}}
    -
    {{$.i18n.Tr "admin.config.xorm_log_mode"}}
    +
    {{$.locale.Tr "admin.config.xorm_log_mode"}}
    {{if .EnableXORMLog}} {{if .Loggers.xorm.SubLogDescriptions}} -
    {{$.i18n.Tr "admin.config.own_named_logger"}}
    +
    {{$.locale.Tr "admin.config.own_named_logger"}}
    {{range .Loggers.xorm.SubLogDescriptions}} -
    {{$.i18n.Tr "admin.config.log_mode"}}
    +
    {{$.locale.Tr "admin.config.log_mode"}}
    {{.Name}} ({{.Provider}})
    -
    {{$.i18n.Tr "admin.config.log_config"}}
    +
    {{$.locale.Tr "admin.config.log_config"}}
    {{.Config | JsonPrettyPrint}}
    {{end}} {{else}} -
    {{$.i18n.Tr "admin.config.routes_to_default_logger"}}
    +
    {{$.locale.Tr "admin.config.routes_to_default_logger"}}
    {{end}} -
    {{$.i18n.Tr "admin.config.xorm_log_sql"}}
    +
    {{$.locale.Tr "admin.config.xorm_log_sql"}}
    {{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    {{else}} -
    {{$.i18n.Tr "admin.config.disabled_logger"}}
    +
    {{$.locale.Tr "admin.config.disabled_logger"}}
    {{end}}
    diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl index cf3532c77d..b5db356bd8 100644 --- a/templates/admin/cron.tmpl +++ b/templates/admin/cron.tmpl @@ -1,5 +1,5 @@

    - {{.i18n.Tr "admin.monitor.cron"}} + {{.locale.Tr "admin.monitor.cron"}}

    @@ -7,24 +7,24 @@ - {{.i18n.Tr "admin.monitor.name"}} - {{.i18n.Tr "admin.monitor.schedule"}} - {{.i18n.Tr "admin.monitor.next"}} - {{.i18n.Tr "admin.monitor.previous"}} - {{.i18n.Tr "admin.monitor.execute_times"}} - {{.i18n.Tr "admin.monitor.last_execution_result"}} + {{.locale.Tr "admin.monitor.name"}} + {{.locale.Tr "admin.monitor.schedule"}} + {{.locale.Tr "admin.monitor.next"}} + {{.locale.Tr "admin.monitor.previous"}} + {{.locale.Tr "admin.monitor.execute_times"}} + {{.locale.Tr "admin.monitor.last_execution_result"}} {{range .Entries}} - - {{$.i18n.Tr (printf "admin.dashboard.%s" .Name)}} + + {{$.locale.Tr (printf "admin.dashboard.%s" .Name)}} {{.Spec}} {{DateFmtLong .Next}} {{if gt .Prev.Year 1 }}{{DateFmtLong .Prev}}{{else}}N/A{{end}} {{.ExecTimes}} - {{if eq .Status "" }}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}} + {{if eq .Status "" }}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}} {{end}} diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 5a4b82f1b9..80eea91210 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -5,19 +5,19 @@ {{template "base/alert" .}} {{if .NeedUpdate}}
    -

    {{(.i18n.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}

    +

    {{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}

    {{end}}

    - {{.i18n.Tr "admin.dashboard.statistic"}} + {{.locale.Tr "admin.dashboard.statistic"}}

    - {{.i18n.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.AuthSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}} + {{.locale.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.AuthSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}}

    - {{.i18n.Tr "admin.dashboard.operations"}} + {{.locale.Tr "admin.dashboard.operations"}}

    {{.CsrfTokenHtml}} @@ -25,52 +25,52 @@ - - + + - - + + - - + + - - + + {{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}} - - + + - - + + {{end}} - - + + - - + + - - + + - - + + - - + +
    {{.i18n.Tr "admin.dashboard.delete_inactive_accounts"}}{{.locale.Tr "admin.dashboard.delete_inactive_accounts"}}
    {{.i18n.Tr "admin.dashboard.delete_repo_archives"}}{{.locale.Tr "admin.dashboard.delete_repo_archives"}}
    {{.i18n.Tr "admin.dashboard.delete_missing_repos"}}{{.locale.Tr "admin.dashboard.delete_missing_repos"}}
    {{.i18n.Tr "admin.dashboard.git_gc_repos"}}{{.locale.Tr "admin.dashboard.git_gc_repos"}}
    {{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}
    - {{.i18n.Tr "admin.dashboard.resync_all_sshkeys.desc"}}    		{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}
    + {{.locale.Tr "admin.dashboard.resync_all_sshkeys.desc"}}
    {{.i18n.Tr "admin.dashboard.resync_all_sshprincipals"}}
    - {{.i18n.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}    		{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}
    + {{.locale.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}
    {{.i18n.Tr "admin.dashboard.resync_all_hooks"}}{{.locale.Tr "admin.dashboard.resync_all_hooks"}}
    {{.i18n.Tr "admin.dashboard.reinit_missing_repos"}}{{.locale.Tr "admin.dashboard.reinit_missing_repos"}}
    {{.i18n.Tr "admin.dashboard.sync_external_users"}}{{.locale.Tr "admin.dashboard.sync_external_users"}}
    {{.i18n.Tr "admin.dashboard.repo_health_check"}}{{.locale.Tr "admin.dashboard.repo_health_check"}}
    {{.i18n.Tr "admin.dashboard.delete_generated_repository_avatars"}}{{.locale.Tr "admin.dashboard.delete_generated_repository_avatars"}}
    @@ -78,69 +78,69 @@

    - {{.i18n.Tr "admin.dashboard.system_status"}} + {{.locale.Tr "admin.dashboard.system_status"}}

    -
    {{.i18n.Tr "admin.dashboard.server_uptime"}}
    +
    {{.locale.Tr "admin.dashboard.server_uptime"}}
    {{.SysStatus.Uptime}}
    -
    {{.i18n.Tr "admin.dashboard.current_goroutine"}}
    +
    {{.locale.Tr "admin.dashboard.current_goroutine"}}
    {{.SysStatus.NumGoroutine}}
    -
    {{.i18n.Tr "admin.dashboard.current_memory_usage"}}
    +
    {{.locale.Tr "admin.dashboard.current_memory_usage"}}
    {{.SysStatus.MemAllocated}}
    -
    {{.i18n.Tr "admin.dashboard.total_memory_allocated"}}
    +
    {{.locale.Tr "admin.dashboard.total_memory_allocated"}}
    {{.SysStatus.MemTotal}}
    -
    {{.i18n.Tr "admin.dashboard.memory_obtained"}}
    +
    {{.locale.Tr "admin.dashboard.memory_obtained"}}
    {{.SysStatus.MemSys}}
    -
    {{.i18n.Tr "admin.dashboard.pointer_lookup_times"}}
    +
    {{.locale.Tr "admin.dashboard.pointer_lookup_times"}}
    {{.SysStatus.Lookups}}
    -
    {{.i18n.Tr "admin.dashboard.memory_allocate_times"}}
    +
    {{.locale.Tr "admin.dashboard.memory_allocate_times"}}
    {{.SysStatus.MemMallocs}}
    -
    {{.i18n.Tr "admin.dashboard.memory_free_times"}}
    +
    {{.locale.Tr "admin.dashboard.memory_free_times"}}
    {{.SysStatus.MemFrees}}
    -
    {{.i18n.Tr "admin.dashboard.current_heap_usage"}}
    +
    {{.locale.Tr "admin.dashboard.current_heap_usage"}}
    {{.SysStatus.HeapAlloc}}
    -
    {{.i18n.Tr "admin.dashboard.heap_memory_obtained"}}
    +
    {{.locale.Tr "admin.dashboard.heap_memory_obtained"}}
    {{.SysStatus.HeapSys}}
    -
    {{.i18n.Tr "admin.dashboard.heap_memory_idle"}}
    +
    {{.locale.Tr "admin.dashboard.heap_memory_idle"}}
    {{.SysStatus.HeapIdle}}
    -
    {{.i18n.Tr "admin.dashboard.heap_memory_in_use"}}
    +
    {{.locale.Tr "admin.dashboard.heap_memory_in_use"}}
    {{.SysStatus.HeapInuse}}
    -
    {{.i18n.Tr "admin.dashboard.heap_memory_released"}}
    +
    {{.locale.Tr "admin.dashboard.heap_memory_released"}}
    {{.SysStatus.HeapReleased}}
    -
    {{.i18n.Tr "admin.dashboard.heap_objects"}}
    +
    {{.locale.Tr "admin.dashboard.heap_objects"}}
    {{.SysStatus.HeapObjects}}
    -
    {{.i18n.Tr "admin.dashboard.bootstrap_stack_usage"}}
    +
    {{.locale.Tr "admin.dashboard.bootstrap_stack_usage"}}
    {{.SysStatus.StackInuse}}
    -
    {{.i18n.Tr "admin.dashboard.stack_memory_obtained"}}
    +
    {{.locale.Tr "admin.dashboard.stack_memory_obtained"}}
    {{.SysStatus.StackSys}}
    -
    {{.i18n.Tr "admin.dashboard.mspan_structures_usage"}}
    +
    {{.locale.Tr "admin.dashboard.mspan_structures_usage"}}
    {{.SysStatus.MSpanInuse}}
    -
    {{.i18n.Tr "admin.dashboard.mspan_structures_obtained"}}
    +
    {{.locale.Tr "admin.dashboard.mspan_structures_obtained"}}
    {{.SysStatus.MSpanSys}}
    -
    {{.i18n.Tr "admin.dashboard.mcache_structures_usage"}}
    +
    {{.locale.Tr "admin.dashboard.mcache_structures_usage"}}
    {{.SysStatus.MCacheInuse}}
    -
    {{.i18n.Tr "admin.dashboard.mcache_structures_obtained"}}
    +
    {{.locale.Tr "admin.dashboard.mcache_structures_obtained"}}
    {{.SysStatus.MCacheSys}}
    -
    {{.i18n.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}
    +
    {{.locale.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}
    {{.SysStatus.BuckHashSys}}
    -
    {{.i18n.Tr "admin.dashboard.gc_metadata_obtained"}}
    +
    {{.locale.Tr "admin.dashboard.gc_metadata_obtained"}}
    {{.SysStatus.GCSys}}
    -
    {{.i18n.Tr "admin.dashboard.other_system_allocation_obtained"}}
    +
    {{.locale.Tr "admin.dashboard.other_system_allocation_obtained"}}
    {{.SysStatus.OtherSys}}
    -
    {{.i18n.Tr "admin.dashboard.next_gc_recycle"}}
    +
    {{.locale.Tr "admin.dashboard.next_gc_recycle"}}
    {{.SysStatus.NextGC}}
    -
    {{.i18n.Tr "admin.dashboard.last_gc_time"}}
    +
    {{.locale.Tr "admin.dashboard.last_gc_time"}}
    {{.SysStatus.LastGC}}
    -
    {{.i18n.Tr "admin.dashboard.total_gc_pause"}}
    +
    {{.locale.Tr "admin.dashboard.total_gc_pause"}}
    {{.SysStatus.PauseTotalNs}}
    -
    {{.i18n.Tr "admin.dashboard.last_gc_pause"}}
    +
    {{.locale.Tr "admin.dashboard.last_gc_pause"}}
    {{.SysStatus.PauseNs}}
    -
    {{.i18n.Tr "admin.dashboard.gc_times"}}
    +
    {{.locale.Tr "admin.dashboard.gc_times"}}
    {{.SysStatus.NumGC}}
    diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 92444efbd8..adf5b9bef7 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -4,28 +4,28 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "admin.emails.email_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) + {{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})

    - {{.i18n.Tr "repo.issues.filter_sort"}} + {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{.i18n.Tr "admin.emails.filter_sort.email"}} - {{.i18n.Tr "admin.emails.filter_sort.email_reverse"}} - {{.i18n.Tr "admin.emails.filter_sort.name"}} - {{.i18n.Tr "admin.emails.filter_sort.name_reverse"}} + {{.locale.Tr "admin.emails.filter_sort.email"}} + {{.locale.Tr "admin.emails.filter_sort.email_reverse"}} + {{.locale.Tr "admin.emails.filter_sort.name"}} + {{.locale.Tr "admin.emails.filter_sort.name_reverse"}}
    - - + +
    @@ -34,16 +34,16 @@ - {{.i18n.Tr "admin.users.name"}} + {{.locale.Tr "admin.users.name"}} {{SortArrow "username" "reverseusername" $.SortType false}} - {{.i18n.Tr "admin.users.full_name"}} + {{.locale.Tr "admin.users.full_name"}} - {{.i18n.Tr "email"}} + {{.locale.Tr "email"}} {{SortArrow "email" "reverseemail" $.SortType true}} - {{.i18n.Tr "admin.emails.primary"}} - {{.i18n.Tr "admin.emails.activated"}} + {{.locale.Tr "admin.emails.primary"}} + {{.locale.Tr "admin.emails.activated"}} @@ -75,10 +75,10 @@ @@ -22,51 +22,51 @@ {{if .Team.Description}} {{.Team.Description}} {{else}} - {{.i18n.Tr "org.teams.no_desc"}} + {{.locale.Tr "org.teams.no_desc"}} {{end}}
    {{if eq .Team.LowerName "owners"}}
    - {{.i18n.Tr "org.teams.owners_permission_desc" | Str2html}} + {{.locale.Tr "org.teams.owners_permission_desc" | Str2html}}
    {{else}}
    -

    {{.i18n.Tr "org.team_access_desc"}}

    +

    {{.locale.Tr "org.team_access_desc"}}

      {{if .Team.IncludesAllRepositories}} -
    • {{.i18n.Tr "org.teams.all_repositories" | Str2html}} +
    • {{.locale.Tr "org.teams.all_repositories" | Str2html}} {{else}} -
    • {{.i18n.Tr "org.teams.specific_repositories" | Str2html}} +
    • {{.locale.Tr "org.teams.specific_repositories" | Str2html}} {{end}} {{if .Team.CanCreateOrgRepo}} -
    • {{.i18n.Tr "org.teams.can_create_org_repo"}} +
    • {{.locale.Tr "org.teams.can_create_org_repo"}} {{end}}
    {{if (eq .Team.AccessMode 2)}} -

    {{.i18n.Tr "org.settings.permission"}}

    - {{.i18n.Tr "org.teams.write_permission_desc" | Str2html}} +

    {{.locale.Tr "org.settings.permission"}}

    + {{.locale.Tr "org.teams.write_permission_desc" | Str2html}} {{else if (eq .Team.AccessMode 3)}} -

    {{.i18n.Tr "org.settings.permission"}}

    - {{.i18n.Tr "org.teams.admin_permission_desc" | Str2html}} +

    {{.locale.Tr "org.settings.permission"}}

    + {{.locale.Tr "org.teams.admin_permission_desc" | Str2html}} {{else}} - - + + {{range $t, $unit := $.Units}} {{if and (lt $unit.MaxPerm 2) (not $unit.Type.UnitGlobalDisabled)}} - + {{end}} @@ -79,17 +79,17 @@ {{if .IsOrganizationOwner}}
    - {{svg "octicon-gear"}} {{$.i18n.Tr "org.teams.settings"}} + {{svg "octicon-gear"}} {{$.locale.Tr "org.teams.settings"}}
    {{end}} diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 49407ef194..465701d96e 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}} {{if .IsOrganizationOwner}}
    - {{svg "octicon-plus"}} {{.i18n.Tr "org.create_new_team"}} + {{svg "octicon-plus"}} {{.locale.Tr "org.create_new_team"}}
    {{end}} @@ -20,12 +20,12 @@ + data-name="{{.Name}}">{{$.locale.Tr "org.teams.leave"}} {{else if $.IsOrganizationOwner}} {{$.CsrfTokenHtml}} - + {{end}} @@ -38,7 +38,7 @@ {{end}}
    -

    {{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

    +

    {{.NumMembers}} {{$.locale.Tr "org.lower_members"}} · {{.NumRepos}} {{$.locale.Tr "org.lower_repositories"}}

    {{end}} @@ -48,10 +48,10 @@ diff --git a/templates/package/content/composer.tmpl b/templates/package/content/composer.tmpl index 29162f97b0..8cc18f8ba8 100644 --- a/templates/package/content/composer.tmpl +++ b/templates/package/content/composer.tmpl @@ -1,9 +1,9 @@ {{if eq .PackageDescriptor.Package.Type "composer"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    {
 	"repositories": [{
 			"type": "composer",
@@ -13,34 +13,34 @@
 }
    - + 
    composer require {{.PackageDescriptor.Package.Name}}:{{.PackageDescriptor.Version.Version}}
    - +
    {{if .PackageDescriptor.Metadata.Description}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{.PackageDescriptor.Metadata.Description}}
    {{end}} {{if or .PackageDescriptor.Metadata.Require .PackageDescriptor.Metadata.RequireDev}} -

    {{.i18n.Tr "packages.dependencies"}}

    +

    {{.locale.Tr "packages.dependencies"}}

    - {{template "package/content/composer_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.Require "title" (.i18n.Tr "packages.composer.dependencies")}} - {{template "package/content/composer_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.RequireDev "title" (.i18n.Tr "packages.composer.dependencies.development")}} + {{template "package/content/composer_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.Require "title" (.locale.Tr "packages.composer.dependencies")}} + {{template "package/content/composer_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.RequireDev "title" (.locale.Tr "packages.composer.dependencies.development")}}
    {{end}} {{if or .PackageDescriptor.Metadata.Keywords}} -

    {{.i18n.Tr "packages.keywords"}}

    +

    {{.locale.Tr "packages.keywords"}}

    {{range .PackageDescriptor.Metadata.Keywords}} {{.}} diff --git a/templates/package/content/composer_dependencies.tmpl b/templates/package/content/composer_dependencies.tmpl index 1ab644f417..b55c1b5b88 100644 --- a/templates/package/content/composer_dependencies.tmpl +++ b/templates/package/content/composer_dependencies.tmpl @@ -3,8 +3,8 @@
    {{.i18n.Tr "units.unit"}}{{.i18n.Tr "org.team_permission_desc"}}{{.locale.Tr "units.unit"}}{{.locale.Tr "org.team_permission_desc"}}
    {{$.i18n.Tr $unit.NameKey}}{{$.locale.Tr $unit.NameKey}} {{if eq ($.Team.UnitAccessMode $unit.Type) 0 -}} - {{$.i18n.Tr "org.teams.none_access"}} + {{$.locale.Tr "org.teams.none_access"}} {{- else if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $unit.Type) 1) -}} - {{$.i18n.Tr "org.teams.read_access"}} + {{$.locale.Tr "org.teams.read_access"}} {{- else if eq ($.Team.UnitAccessMode $unit.Type) 2 -}} - {{$.i18n.Tr "org.teams.write_access"}} + {{$.locale.Tr "org.teams.write_access"}} {{- end}}
    - - + + diff --git a/templates/package/content/conan.tmpl b/templates/package/content/conan.tmpl index 3c1c35c00f..c496cee55c 100644 --- a/templates/package/content/conan.tmpl +++ b/templates/package/content/conan.tmpl @@ -1,30 +1,30 @@ {{if eq .PackageDescriptor.Package.Type "conan"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    conan remote add gitea {{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/conan
    - + 
    conan install --remote=gitea {{.PackageDescriptor.Package.Name}}/{{.PackageDescriptor.Version.Version}}
    - +
    {{if .PackageDescriptor.Metadata.Description}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{if .PackageDescriptor.Metadata.Description}}{{.PackageDescriptor.Metadata.Description}}{{end}}
    {{end}} {{if or .PackageDescriptor.Metadata.Keywords}} -

    {{.i18n.Tr "packages.keywords"}}

    +

    {{.locale.Tr "packages.keywords"}}

    {{range .PackageDescriptor.Metadata.Keywords}} {{.}} diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl index 14d4a56398..44a64d13ee 100644 --- a/templates/package/content/container.tmpl +++ b/templates/package/content/container.tmpl @@ -1,9 +1,9 @@ {{if eq .PackageDescriptor.Package.Type "container"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + {{if eq .PackageDescriptor.Metadata.Type "helm"}} 
    helm pull oci://{{.RegistryHost}}/{{.PackageDescriptor.Owner.LowerName}}/{{.PackageDescriptor.Package.LowerName}} --version {{.PackageDescriptor.Version.LowerVersion}}
    {{else}} @@ -15,12 +15,12 @@ {{end}}
    - +
    {{if .PackageDescriptor.Metadata.MultiArch}} -

    {{.i18n.Tr "packages.container.multi_arch"}}

    +

    {{.locale.Tr "packages.container.multi_arch"}}

    {{range $arch, $digest := .PackageDescriptor.Metadata.MultiArch}} @@ -35,13 +35,13 @@
    {{end}} {{if .PackageDescriptor.Metadata.Description}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{.PackageDescriptor.Metadata.Description}}
    {{end}} {{if .PackageDescriptor.Metadata.ImageLayers}} -

    {{.i18n.Tr "packages.container.layers"}}

    +

    {{.locale.Tr "packages.container.layers"}}

    {{.root.i18n.Tr "packages.dependency.id"}}{{.root.i18n.Tr "packages.dependency.version"}}{{.root.locale.Tr "packages.dependency.id"}}{{.root.locale.Tr "packages.dependency.version"}}
    @@ -55,13 +55,13 @@ {{end}} {{if .PackageDescriptor.Metadata.Labels}} -

    {{.i18n.Tr "packages.container.labels"}}

    +

    {{.locale.Tr "packages.container.labels"}}

    - - + + diff --git a/templates/package/content/generic.tmpl b/templates/package/content/generic.tmpl index 05a47b3ef4..045ff7d08a 100644 --- a/templates/package/content/generic.tmpl +++ b/templates/package/content/generic.tmpl @@ -1,13 +1,13 @@ {{if eq .PackageDescriptor.Package.Type "generic"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    curl {{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/generic/{{.PackageDescriptor.Package.Name}}/{{.PackageDescriptor.Version.Version}}/{{(index .PackageDescriptor.Files 0).File.Name}}
    - +
    diff --git a/templates/package/content/helm.tmpl b/templates/package/content/helm.tmpl index a85f7c4850..59cdc157b4 100644 --- a/templates/package/content/helm.tmpl +++ b/templates/package/content/helm.tmpl @@ -1,37 +1,37 @@ {{if eq .PackageDescriptor.Package.Type "helm"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    helm repo add gitea {{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/helm
 helm repo update
    - + 
    helm install {{.PackageDescriptor.Package.Name}} gitea/{{.PackageDescriptor.Package.Name}}
    - +
    {{if .PackageDescriptor.Metadata.Description}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{.PackageDescriptor.Metadata.Description}}
    {{end}} {{if .PackageDescriptor.Metadata.Dependencies}} -

    {{.i18n.Tr "packages.dependencies"}}

    +

    {{.locale.Tr "packages.dependencies"}}

    {{.i18n.Tr "packages.container.labels.key"}}{{.i18n.Tr "packages.container.labels.value"}}{{.locale.Tr "packages.container.labels.key"}}{{.locale.Tr "packages.container.labels.value"}}
    - - + + @@ -47,7 +47,7 @@ helm repo update {{end}} {{if .PackageDescriptor.Metadata.Keywords}} -

    {{.i18n.Tr "packages.keywords"}}

    +

    {{.locale.Tr "packages.keywords"}}

    {{range .PackageDescriptor.Metadata.Keywords}} {{.}} diff --git a/templates/package/content/maven.tmpl b/templates/package/content/maven.tmpl index 32b89616cb..0b5612151c 100644 --- a/templates/package/content/maven.tmpl +++ b/templates/package/content/maven.tmpl @@ -1,9 +1,9 @@ {{if eq .PackageDescriptor.Package.Type "maven"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    <repositories>
 	<repository>
 		<id>gitea</id>
@@ -24,7 +24,7 @@
 </distributionManagement>
    - + 
    <dependency>
 	<groupId>{{.PackageDescriptor.Metadata.GroupID}}</groupId>
 	<artifactId>{{.PackageDescriptor.Metadata.ArtifactID}}</artifactId>
@@ -32,28 +32,28 @@
 </dependency>
    - + 
    mvn install
    - + 
    mvn dependency:get -DremoteRepositories={{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/maven -Dartifact={{.PackageDescriptor.Metadata.GroupID}}:{{.PackageDescriptor.Metadata.ArtifactID}}:{{.PackageDescriptor.Version.Version}}
    - +
    {{if .PackageDescriptor.Metadata.Description}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{.PackageDescriptor.Metadata.Description}}
    {{end}} {{if .PackageDescriptor.Metadata.Dependencies}} -

    {{.i18n.Tr "packages.dependencies"}}

    +

    {{.locale.Tr "packages.dependencies"}}

    {{range .PackageDescriptor.Metadata.Dependencies}} diff --git a/templates/package/content/npm.tmpl b/templates/package/content/npm.tmpl index bc714e5c97..33d51d4dfd 100644 --- a/templates/package/content/npm.tmpl +++ b/templates/package/content/npm.tmpl @@ -1,27 +1,27 @@ {{if eq .PackageDescriptor.Package.Type "npm"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    {{if .PackageDescriptor.Metadata.Scope}}{{.PackageDescriptor.Metadata.Scope}}:{{end}}registry={{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/npm/
    - + 
    npm install {{.PackageDescriptor.Package.Name}}@{{.PackageDescriptor.Version.Version}}
    - + 
    "{{.PackageDescriptor.Package.Name}}": "{{.PackageDescriptor.Version.Version}}"
    - +
    {{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.Readme}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{if .PackageDescriptor.Metadata.Readme}}
    @@ -34,19 +34,19 @@ {{end}} {{if or .PackageDescriptor.Metadata.Dependencies .PackageDescriptor.Metadata.DevelopmentDependencies .PackageDescriptor.Metadata.PeerDependencies .PackageDescriptor.Metadata.OptionalDependencies}} -

    {{.i18n.Tr "packages.dependencies"}}

    +

    {{.locale.Tr "packages.dependencies"}}

    - {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.Dependencies "title" (.i18n.Tr "packages.npm.dependencies")}} - {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.DevelopmentDependencies "title" (.i18n.Tr "packages.npm.dependencies.development")}} - {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.PeerDependencies "title" (.i18n.Tr "packages.npm.dependencies.peer")}} - {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.OptionalDependencies "title" (.i18n.Tr "packages.npm.dependencies.optional")}} + {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.Dependencies "title" (.locale.Tr "packages.npm.dependencies")}} + {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.DevelopmentDependencies "title" (.locale.Tr "packages.npm.dependencies.development")}} + {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.PeerDependencies "title" (.locale.Tr "packages.npm.dependencies.peer")}} + {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.OptionalDependencies "title" (.locale.Tr "packages.npm.dependencies.optional")}}
    {{end}} {{if .PackageDescriptor.Metadata.Keywords}} -

    {{.i18n.Tr "packages.keywords"}}

    +

    {{.locale.Tr "packages.keywords"}}

    {{range .PackageDescriptor.Metadata.Keywords}} {{.}} diff --git a/templates/package/content/npm_dependencies.tmpl b/templates/package/content/npm_dependencies.tmpl index 1ab644f417..b55c1b5b88 100644 --- a/templates/package/content/npm_dependencies.tmpl +++ b/templates/package/content/npm_dependencies.tmpl @@ -3,8 +3,8 @@
    {{.i18n.Tr "packages.dependency.id"}}{{.i18n.Tr "packages.dependency.version"}}{{.locale.Tr "packages.dependency.id"}}{{.locale.Tr "packages.dependency.version"}}
    - - + + diff --git a/templates/package/content/nuget.tmpl b/templates/package/content/nuget.tmpl index 879d7d0176..4ea41fa826 100644 --- a/templates/package/content/nuget.tmpl +++ b/templates/package/content/nuget.tmpl @@ -1,23 +1,23 @@ {{if eq .PackageDescriptor.Package.Type "nuget"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    dotnet nuget add source --name Gitea --username your_username --password your_token {{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/nuget/index.json
    - + 
    dotnet add package --source Gitea --version {{.PackageDescriptor.Version.Version}} {{.PackageDescriptor.Package.Name}}
    - +
    {{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.ReleaseNotes}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{if .PackageDescriptor.Metadata.Description}}{{.PackageDescriptor.Metadata.Description}}{{end}} {{if .PackageDescriptor.Metadata.ReleaseNotes}}{{Str2html .PackageDescriptor.Metadata.ReleaseNotes}}{{end}} @@ -25,14 +25,14 @@ {{end}} {{if .PackageDescriptor.Metadata.Dependencies}} -

    {{.i18n.Tr "packages.dependencies"}}

    +

    {{.locale.Tr "packages.dependencies"}}

    {{.root.i18n.Tr "packages.dependency.id"}}{{.root.i18n.Tr "packages.dependency.version"}}{{.root.locale.Tr "packages.dependency.id"}}{{.root.locale.Tr "packages.dependency.version"}}
    - - - + + + diff --git a/templates/package/content/pypi.tmpl b/templates/package/content/pypi.tmpl index 352f4f617f..1cce31f537 100644 --- a/templates/package/content/pypi.tmpl +++ b/templates/package/content/pypi.tmpl @@ -1,18 +1,18 @@ {{if eq .PackageDescriptor.Package.Type "pypi"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    pip install --extra-index-url {{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/pypi/simple {{.PackageDescriptor.Package.Name}}
    - +
    {{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.LongDescription .PackageDescriptor.Metadata.Summary}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{if .PackageDescriptor.Metadata.Summary}}{{.PackageDescriptor.Metadata.Summary}}{{end}}

    {{if .PackageDescriptor.Metadata.LongDescription}} @@ -23,9 +23,9 @@
    {{end}} {{if .PackageDescriptor.Metadata.RequiresPython}} -

    {{.i18n.Tr "packages.requirements"}}

    +

    {{.locale.Tr "packages.requirements"}}

    - {{.i18n.Tr "packages.pypi.requires"}}: {{.PackageDescriptor.Metadata.RequiresPython}} + {{.locale.Tr "packages.pypi.requires"}}: {{.PackageDescriptor.Metadata.RequiresPython}}
    {{end}} {{end}} diff --git a/templates/package/content/rubygems.tmpl b/templates/package/content/rubygems.tmpl index 6e22d7fbea..0cb7b670b1 100644 --- a/templates/package/content/rubygems.tmpl +++ b/templates/package/content/rubygems.tmpl @@ -1,39 +1,39 @@ {{if eq .PackageDescriptor.Package.Type "rubygems"}} -

    {{.i18n.Tr "packages.installation"}}

    +

    {{.locale.Tr "packages.installation"}}

    - + 
    gem install {{.PackageDescriptor.Package.Name}} --version "{{.PackageDescriptor.Version.Version}}" --source "{{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/rubygems"
    - + 
    source "{{AppUrl}}api/packages/{{.PackageDescriptor.Owner.Name}}/rubygems" do
 	gem "{{.PackageDescriptor.Package.Name}}", "{{.PackageDescriptor.Version.Version}}"
 end
    - +
    {{if .PackageDescriptor.Metadata.Description}} -

    {{.i18n.Tr "packages.about"}}

    +

    {{.locale.Tr "packages.about"}}

    {{.PackageDescriptor.Metadata.Description}}
    {{end}} {{if or .PackageDescriptor.Metadata.RequiredRubyVersion .PackageDescriptor.Metadata.RequiredRubygemsVersion}} -

    {{.i18n.Tr "packages.requirements"}}

    +

    {{.locale.Tr "packages.requirements"}}

    - {{if .PackageDescriptor.Metadata.RequiredRubyVersion}}

    {{.i18n.Tr "packages.rubygems.required.ruby"}}: {{range $i, $v := .PackageDescriptor.Metadata.RequiredRubyVersion}}{{if gt $i 0}}, {{end}}{{$v.Restriction}}{{$v.Version}}{{end}}

    {{end}} - {{if .PackageDescriptor.Metadata.RequiredRubygemsVersion}}

    {{.i18n.Tr "packages.rubygems.required.rubygems"}}: {{range $i, $v := .PackageDescriptor.Metadata.RequiredRubygemsVersion}}{{if gt $i 0}}, {{end}}{{$v.Restriction}}{{$v.Version}}{{end}}

    {{end}} + {{if .PackageDescriptor.Metadata.RequiredRubyVersion}}

    {{.locale.Tr "packages.rubygems.required.ruby"}}: {{range $i, $v := .PackageDescriptor.Metadata.RequiredRubyVersion}}{{if gt $i 0}}, {{end}}{{$v.Restriction}}{{$v.Version}}{{end}}

    {{end}} + {{if .PackageDescriptor.Metadata.RequiredRubygemsVersion}}

    {{.locale.Tr "packages.rubygems.required.rubygems"}}: {{range $i, $v := .PackageDescriptor.Metadata.RequiredRubygemsVersion}}{{if gt $i 0}}, {{end}}{{$v.Restriction}}{{$v.Version}}{{end}}

    {{end}}
    {{end}} {{if or .PackageDescriptor.Metadata.RuntimeDependencies .PackageDescriptor.Metadata.DevelopmentDependencies}} -

    {{.i18n.Tr "packages.dependencies"}}

    +

    {{.locale.Tr "packages.dependencies"}}

    - {{template "package/content/rubygems_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.RuntimeDependencies "title" (.i18n.Tr "packages.rubygems.dependencies.runtime")}} - {{template "package/content/rubygems_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.DevelopmentDependencies "title" (.i18n.Tr "packages.rubygems.dependencies.development")}} + {{template "package/content/rubygems_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.RuntimeDependencies "title" (.locale.Tr "packages.rubygems.dependencies.runtime")}} + {{template "package/content/rubygems_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.DevelopmentDependencies "title" (.locale.Tr "packages.rubygems.dependencies.development")}}
    {{end}} diff --git a/templates/package/content/rubygems_dependencies.tmpl b/templates/package/content/rubygems_dependencies.tmpl index 79f66ad3f9..80febc84f4 100644 --- a/templates/package/content/rubygems_dependencies.tmpl +++ b/templates/package/content/rubygems_dependencies.tmpl @@ -3,8 +3,8 @@
    {{.i18n.Tr "packages.dependency.id"}}{{.i18n.Tr "packages.dependency.version"}}{{.i18n.Tr "packages.nuget.dependency.framework"}}{{.locale.Tr "packages.dependency.id"}}{{.locale.Tr "packages.dependency.version"}}{{.locale.Tr "packages.nuget.dependency.framework"}}
    - - + + diff --git a/templates/package/metadata/composer.tmpl b/templates/package/metadata/composer.tmpl index 1178d00e0d..2e76a10dab 100644 --- a/templates/package/metadata/composer.tmpl +++ b/templates/package/metadata/composer.tmpl @@ -1,5 +1,5 @@ {{if eq .PackageDescriptor.Package.Type "composer"}} - {{range .PackageDescriptor.Metadata.Authors}}
    {{svg "octicon-person" 16 "mr-3"}} {{.Name}}
    {{end}} - {{if .PackageDescriptor.Metadata.Homepage}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} - {{range .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "mr-3"}} {{.}}
    {{end}} + {{range .PackageDescriptor.Metadata.Authors}}
    {{svg "octicon-person" 16 "mr-3"}} {{.Name}}
    {{end}} + {{if .PackageDescriptor.Metadata.Homepage}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} + {{range .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "mr-3"}} {{.}}
    {{end}} {{end}} diff --git a/templates/package/metadata/conan.tmpl b/templates/package/metadata/conan.tmpl index 1ef82aea4e..41cb42b692 100644 --- a/templates/package/metadata/conan.tmpl +++ b/templates/package/metadata/conan.tmpl @@ -1,6 +1,6 @@ {{if eq .PackageDescriptor.Package.Type "conan"}} - {{if .PackageDescriptor.Metadata.Author}}
    {{svg "octicon-person" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Author}}
    {{end}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} - {{if .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "mr-3"}} {{.PackageDescriptor.Metadata.License}}
    {{end}} - {{if .PackageDescriptor.Metadata.RepositoryURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.conan.details.repository"}}
    {{end}} + {{if .PackageDescriptor.Metadata.Author}}
    {{svg "octicon-person" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Author}}
    {{end}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} + {{if .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "mr-3"}} {{.PackageDescriptor.Metadata.License}}
    {{end}} + {{if .PackageDescriptor.Metadata.RepositoryURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.conan.details.repository"}}
    {{end}} {{end}} diff --git a/templates/package/metadata/container.tmpl b/templates/package/metadata/container.tmpl index 117d7e46a2..1b13072c38 100644 --- a/templates/package/metadata/container.tmpl +++ b/templates/package/metadata/container.tmpl @@ -1,9 +1,9 @@ {{if eq .PackageDescriptor.Package.Type "container"}} -
    {{svg "octicon-package" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Type.Name}}
    - {{if .PackageDescriptor.Metadata.Platform}}
    {{svg "octicon-cpu" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Platform}}
    {{end}} - {{range .PackageDescriptor.Metadata.Authors}}
    {{svg "octicon-person" 16 "mr-3"}} {{.}}
    {{end}} +
    {{svg "octicon-package" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Type.Name}}
    + {{if .PackageDescriptor.Metadata.Platform}}
    {{svg "octicon-cpu" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Platform}}
    {{end}} + {{range .PackageDescriptor.Metadata.Authors}}
    {{svg "octicon-person" 16 "mr-3"}} {{.}}
    {{end}} {{if .PackageDescriptor.Metadata.Licenses}}
    {{svg "octicon-law" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Licenses}}
    {{end}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} - {{if .PackageDescriptor.Metadata.RepositoryURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.container.details.repository_site"}}
    {{end}} - {{if .PackageDescriptor.Metadata.DocumentationURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.container.details.documentation_site"}}
    {{end}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} + {{if .PackageDescriptor.Metadata.RepositoryURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.container.details.repository_site"}}
    {{end}} + {{if .PackageDescriptor.Metadata.DocumentationURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.container.details.documentation_site"}}
    {{end}} {{end}} diff --git a/templates/package/metadata/helm.tmpl b/templates/package/metadata/helm.tmpl index 7c97c6358e..9f7f5d6ecd 100644 --- a/templates/package/metadata/helm.tmpl +++ b/templates/package/metadata/helm.tmpl @@ -1,4 +1,4 @@ {{if eq .PackageDescriptor.Package.Type "helm"}} - {{range .PackageDescriptor.Metadata.Maintainers}}
    {{svg "octicon-person" 16 "mr-3"}} {{.Name}}
    {{end}} - {{if .PackageDescriptor.Metadata.Home}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} + {{range .PackageDescriptor.Metadata.Maintainers}}
    {{svg "octicon-person" 16 "mr-3"}} {{.Name}}
    {{end}} + {{if .PackageDescriptor.Metadata.Home}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} {{end}} diff --git a/templates/package/metadata/maven.tmpl b/templates/package/metadata/maven.tmpl index 14a613be47..f6fcdf6da8 100644 --- a/templates/package/metadata/maven.tmpl +++ b/templates/package/metadata/maven.tmpl @@ -1,5 +1,5 @@ {{if eq .PackageDescriptor.Package.Type "maven"}} {{if .PackageDescriptor.Metadata.Name}}
    {{svg "octicon-note" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Name}}
    {{end}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} - {{range .PackageDescriptor.Metadata.Licenses}}
    {{svg "octicon-law" 16 "mr-3"}} {{.}}
    {{end}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} + {{range .PackageDescriptor.Metadata.Licenses}}
    {{svg "octicon-law" 16 "mr-3"}} {{.}}
    {{end}} {{end}} diff --git a/templates/package/metadata/npm.tmpl b/templates/package/metadata/npm.tmpl index 3279f9edbf..765566cadf 100644 --- a/templates/package/metadata/npm.tmpl +++ b/templates/package/metadata/npm.tmpl @@ -1,8 +1,8 @@ {{if eq .PackageDescriptor.Package.Type "npm"}} - {{if .PackageDescriptor.Metadata.Author}}
    {{svg "octicon-person" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Author}}
    {{end}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} - {{if .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "mr-3"}} {{.PackageDescriptor.Metadata.License}}
    {{end}} + {{if .PackageDescriptor.Metadata.Author}}
    {{svg "octicon-person" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Author}}
    {{end}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} + {{if .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "mr-3"}} {{.PackageDescriptor.Metadata.License}}
    {{end}} {{range .PackageDescriptor.Properties}} - {{if eq .Name "npm.tag"}}
    {{svg "octicon-versions" 16 "mr-3"}} {{.Value}}
    {{end}} + {{if eq .Name "npm.tag"}}
    {{svg "octicon-versions" 16 "mr-3"}} {{.Value}}
    {{end}} {{end}} {{end}} diff --git a/templates/package/metadata/nuget.tmpl b/templates/package/metadata/nuget.tmpl index d5a3e909b9..b4e62b5a08 100644 --- a/templates/package/metadata/nuget.tmpl +++ b/templates/package/metadata/nuget.tmpl @@ -1,4 +1,4 @@ {{if eq .PackageDescriptor.Package.Type "nuget"}} - {{if .PackageDescriptor.Metadata.Authors}}
    {{svg "octicon-person" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Authors}}
    {{end}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} + {{if .PackageDescriptor.Metadata.Authors}}
    {{svg "octicon-person" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Authors}}
    {{end}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} {{end}} diff --git a/templates/package/metadata/pypi.tmpl b/templates/package/metadata/pypi.tmpl index 5cdfbdfe66..13b53d3591 100644 --- a/templates/package/metadata/pypi.tmpl +++ b/templates/package/metadata/pypi.tmpl @@ -1,5 +1,5 @@ {{if eq .PackageDescriptor.Package.Type "pypi"}} - {{if .PackageDescriptor.Metadata.Author}}
    {{svg "octicon-person" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Author}}
    {{end}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} - {{if .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "mr-3"}} {{.PackageDescriptor.Metadata.License}}
    {{end}} + {{if .PackageDescriptor.Metadata.Author}}
    {{svg "octicon-person" 16 "mr-3"}} {{.PackageDescriptor.Metadata.Author}}
    {{end}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} + {{if .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "mr-3"}} {{.PackageDescriptor.Metadata.License}}
    {{end}} {{end}} diff --git a/templates/package/metadata/rubygems.tmpl b/templates/package/metadata/rubygems.tmpl index dff6830df3..bddb7b5422 100644 --- a/templates/package/metadata/rubygems.tmpl +++ b/templates/package/metadata/rubygems.tmpl @@ -1,5 +1,5 @@ {{if eq .PackageDescriptor.Package.Type "rubygems"}} - {{range .PackageDescriptor.Metadata.Authors}}
    {{svg "octicon-person" 16 "mr-3"}} {{.}}
    {{end}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.i18n.Tr "packages.details.project_site"}}
    {{end}} - {{range .PackageDescriptor.Metadata.Licenses}}
    {{svg "octicon-law" 16 "mr-3"}} {{.}}
    {{end}} + {{range .PackageDescriptor.Metadata.Authors}}
    {{svg "octicon-person" 16 "mr-3"}} {{.}}
    {{end}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{.locale.Tr "packages.details.project_site"}}
    {{end}} + {{range .PackageDescriptor.Metadata.Licenses}}
    {{svg "octicon-law" 16 "mr-3"}} {{.}}
    {{end}} {{end}} diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl index bf2d1d4912..5f045e98b0 100644 --- a/templates/package/settings.tmpl +++ b/templates/package/settings.tmpl @@ -3,12 +3,12 @@ {{template "user/overview/header" .}}
    {{template "base/alert" .}} -

    {{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}}) / {{.i18n.Tr "repo.settings"}}

    +

    {{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}}) / {{.locale.Tr "repo.settings"}}

    - {{.i18n.Tr "packages.settings.link"}} + {{.locale.Tr "packages.settings.link"}}

    -

    {{.i18n.Tr "packages.settings.link.description"}}

    +

    {{.locale.Tr "packages.settings.link.description"}}

    {{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}} @@ -21,7 +21,7 @@ {{end}} -
    {{.i18n.Tr "packages.settings.link.select"}}
    +
    {{.locale.Tr "packages.settings.link.select"}}
    {{range .Repos}}
    {{.Name}}
    @@ -30,36 +30,36 @@
    - +

    - {{.i18n.Tr "repo.settings.danger_zone"}} + {{.locale.Tr "repo.settings.danger_zone"}}

    - +
    -
    {{.i18n.Tr "packages.settings.delete"}}
    -

    {{.i18n.Tr "packages.settings.delete.description"}}

    +
    {{.locale.Tr "packages.settings.delete"}}
    +

    {{.locale.Tr "packages.settings.delete.description"}}

    @@ -46,11 +46,11 @@ {{if not .HasPackages}}
    {{svg "octicon-package" 32}} -

    {{.i18n.Tr "packages.empty"}}

    -

    {{.i18n.Tr "packages.empty.documentation" | Safe}}

    +

    {{.locale.Tr "packages.empty"}}

    +

    {{.locale.Tr "packages.empty.documentation" | Safe}}

    {{else}} -

    {{.i18n.Tr "packages.filter.no_result"}}

    +

    {{.locale.Tr "packages.filter.no_result"}}

    {{end}} {{end}} {{template "base/paginate" .}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 3d9ae5ef44..02bda3fb8f 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,16 +1,16 @@
    -

    {{.PackageDescriptor.Package.Name}} / {{.i18n.Tr "packages.versions"}}

    +

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    - + {{if eq .PackageDescriptor.Package.Type "container"}} {{end}} - +
    @@ -21,12 +21,12 @@ {{.Version.LowerVersion}}
    - {{$.i18n.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.i18n) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} + {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
    {{else}} -

    {{.i18n.Tr "packages.filter.no_result"}}

    +

    {{.locale.Tr "packages.filter.no_result"}}

    {{end}} {{template "base/paginate" .}}
    diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 9a3157c284..ba309b6a77 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -9,11 +9,11 @@

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

    - {{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.i18n}} + {{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}} {{if .HasRepositoryAccess}} - {{.i18n.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink (.PackageDescriptor.Creator.GetDisplayName | Escape) .PackageDescriptor.Repository.HTMLURL (.PackageDescriptor.Repository.FullName | Escape) | Safe}} + {{.locale.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink (.PackageDescriptor.Creator.GetDisplayName | Escape) .PackageDescriptor.Repository.HTMLURL (.PackageDescriptor.Repository.FullName | Escape) | Safe}} {{else}} - {{.i18n.Tr "packages.published_by" $timeStr .PackageDescriptor.Creator.HomeLink (.PackageDescriptor.Creator.GetDisplayName | Escape) | Safe}} + {{.locale.Tr "packages.published_by" $timeStr .PackageDescriptor.Creator.HomeLink (.PackageDescriptor.Creator.GetDisplayName | Escape) | Safe}} {{end}}
    @@ -32,7 +32,7 @@
    - {{.i18n.Tr "packages.details"}} + {{.locale.Tr "packages.details"}}
    {{svg .PackageDescriptor.Package.Type.SVGName 16 "mr-3"}} {{.PackageDescriptor.Package.Type.Name}}
    {{if .HasRepositoryAccess}} @@ -53,7 +53,7 @@
    {{if not (eq .PackageDescriptor.Package.Type "container")}}
    - {{.i18n.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}}) + {{.locale.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}})
    {{range .PackageDescriptor.Files}}
    @@ -65,13 +65,13 @@ {{end}} {{if .LatestVersions}}
    - {{.i18n.Tr "packages.versions"}} ({{.TotalVersionCount}}) - {{.i18n.Tr "packages.versions.view_all"}} + {{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}}) + {{.locale.Tr "packages.versions.view_all"}}
    {{range .LatestVersions}}
    {{.Version}} - {{$.i18n.Tr "packages.versions.on"}} {{.CreatedUnix.FormatDate}} + {{$.locale.Tr "packages.versions.on"}} {{.CreatedUnix.FormatDate}}
    {{end}}
    @@ -80,10 +80,10 @@
    {{if .HasRepositoryAccess}} -
    {{svg "octicon-issue-opened" 16 "mr-3"}} {{.i18n.Tr "repo.issues"}}
    +
    {{svg "octicon-issue-opened" 16 "mr-3"}} {{.locale.Tr "repo.issues"}}
    {{end}} {{if .CanWritePackages}} -
    {{svg "octicon-tools" 16 "mr-3"}} {{.i18n.Tr "repo.settings"}}
    +
    {{svg "octicon-tools" 16 "mr-3"}} {{.locale.Tr "repo.settings"}}
    {{end}}
    {{end}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index c6fca86774..37cdf3ef02 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -8,18 +8,18 @@
    - {{.i18n.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} + {{.locale.Tr "repo.activity.period.filter_label"}} {{.PeriodText}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{.i18n.Tr "repo.activity.period.daily"}} - {{.i18n.Tr "repo.activity.period.halfweekly"}} - {{.i18n.Tr "repo.activity.period.weekly"}} - {{.i18n.Tr "repo.activity.period.monthly"}} - {{.i18n.Tr "repo.activity.period.quarterly"}} - {{.i18n.Tr "repo.activity.period.semiyearly"}} - {{.i18n.Tr "repo.activity.period.yearly"}} + {{.locale.Tr "repo.activity.period.daily"}} + {{.locale.Tr "repo.activity.period.halfweekly"}} + {{.locale.Tr "repo.activity.period.weekly"}} + {{.locale.Tr "repo.activity.period.monthly"}} + {{.locale.Tr "repo.activity.period.quarterly"}} + {{.locale.Tr "repo.activity.period.semiyearly"}} + {{.locale.Tr "repo.activity.period.yearly"}}
    @@ -27,7 +27,7 @@
    {{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}} -

    {{.i18n.Tr "repo.activity.overview"}}

    +

    {{.locale.Tr "repo.activity.overview"}}

    {{if .Permission.CanRead $.UnitTypePullRequests}}
    @@ -41,7 +41,7 @@
    {{end}} - {{.i18n.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount | Safe }} + {{.locale.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.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount | Safe }} + {{.locale.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.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}} + {{.locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}}     {{svg "octicon-git-branch"}} {{.Activity.OpenedPRCount}}
    - {{.i18n.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}} + {{.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}}
    - {{.i18n.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}} + {{.locale.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}}     {{svg "octicon-issue-opened"}} {{.Activity.OpenedIssueCount}}
    - {{.i18n.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}} + {{.locale.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}}     {{end}} @@ -87,26 +87,26 @@ {{if .Permission.CanRead $.UnitTypeCode}} {{if eq .Activity.Code.CommitCountInAllBranches 0}}
    -

    {{.i18n.Tr "repo.activity.no_git_activity" }}

    +

    {{.locale.Tr "repo.activity.no_git_activity" }}

    {{end}} {{if gt .Activity.Code.CommitCountInAllBranches 0}}
    - {{.i18n.Tr "repo.activity.git_stats_exclude_merges" }} - {{.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.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.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.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.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}. + {{.locale.Tr "repo.activity.git_stats_exclude_merges" }} + {{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n" .Activity.Code.AuthorCount}} + {{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n"}} + {{.locale.TrN .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCount}} + {{.locale.Tr "repo.activity.git_stats_push_to_branch" .Repository.DefaultBranch }} + {{.locale.TrN .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCountInAllBranches}} + {{.locale.Tr "repo.activity.git_stats_push_to_all_branches" }} + {{.locale.Tr "repo.activity.git_stats_on_default_branch" .Repository.DefaultBranch }} + {{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n" .Activity.Code.ChangedFiles}} + {{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n"}} + {{.locale.Tr "repo.activity.git_stats_additions" }} + {{.locale.TrN .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n" .Activity.Code.Additions}} + {{.locale.Tr "repo.activity.git_stats_and_deletions" }} + {{.locale.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}.
    @@ -118,20 +118,20 @@ {{if gt .Activity.PublishedReleaseCount 0}}

    {{svg "octicon-tag"}} - {{.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) + {{.locale.Tr "repo.activity.title.releases_published_by" + (.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount) + (.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount) }}

    {{range .Activity.PublishedReleases}}

    - {{$.i18n.Tr "repo.activity.published_release_label"}} + {{$.locale.Tr "repo.activity.published_release_label"}} {{.TagName}} {{if not .IsTag}} {{.Title | RenderEmoji}} {{end}} - {{TimeSinceUnix .CreatedUnix $.i18n}} + {{TimeSinceUnix .CreatedUnix $.locale}}

    {{end}}
    @@ -140,17 +140,17 @@ {{if gt .Activity.MergedPRCount 0}}

    {{svg "octicon-git-pull-request"}} - {{.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) + {{.locale.Tr "repo.activity.title.prs_merged_by" + (.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount) + (.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount) }}

    {{range .Activity.MergedPRs}}

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

    {{end}}
    @@ -159,17 +159,17 @@ {{if gt .Activity.OpenedPRCount 0}}

    {{svg "octicon-git-branch"}} - {{.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) + {{.locale.Tr "repo.activity.title.prs_opened_by" + (.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount) + (.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount) }}

    {{range .Activity.OpenedPRs}}

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

    {{end}}
    @@ -178,17 +178,17 @@ {{if gt .Activity.ClosedIssueCount 0}}

    {{svg "octicon-issue-closed"}} - {{.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) + {{.locale.Tr "repo.activity.title.issues_closed_from" + (.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount) + (.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount) }}

    {{range .Activity.ClosedIssues}}

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

    {{end}}
    @@ -197,17 +197,17 @@ {{if gt .Activity.OpenedIssueCount 0}}

    {{svg "octicon-issue-opened"}} - {{.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) + {{.locale.Tr "repo.activity.title.issues_created_by" + (.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount) + (.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount) }}

    {{range .Activity.OpenedIssues}}

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

    {{end}}
    @@ -216,22 +216,22 @@ {{if gt .Activity.UnresolvedIssueCount 0}}

    {{svg "octicon-comment-discussion"}} - {{.i18n.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}} + {{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}

    - {{.i18n.Tr "repo.activity.unresolved_conv_desc"}} + {{.locale.Tr "repo.activity.unresolved_conv_desc"}}
    {{range .Activity.UnresolvedIssues}}

    - {{$.i18n.Tr "repo.activity.unresolved_conv_label"}} + {{$.locale.Tr "repo.activity.unresolved_conv_label"}} #{{.Index}} {{if .IsPull}} {{.Title | RenderEmoji}} {{else}} {{.Title | RenderEmoji}} {{end}} - {{TimeSinceUnix .UpdatedUnix $.i18n}} + {{TimeSinceUnix .UpdatedUnix $.locale}}

    {{end}}
    diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 3dc3522275..6b3f3eddd7 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -3,21 +3,21 @@
    - {{.NumLines}} {{.i18n.TrN .NumLines "repo.line" "repo.lines"}} + {{.NumLines}} {{.locale.TrN .NumLines "repo.line" "repo.lines"}}
    {{FileSize .FileSize}}
    - {{.i18n.Tr "repo.file_raw"}} + {{.locale.Tr "repo.file_raw"}} {{if not .IsViewCommit}} - {{.i18n.Tr "repo.file_permalink"}} + {{.locale.Tr "repo.file_permalink"}} {{end}} - {{.i18n.Tr "repo.normal_view"}} - {{.i18n.Tr "repo.file_history"}} - {{.i18n.Tr "repo.unescape_control_characters"}} - + {{.locale.Tr "repo.normal_view"}} + {{.locale.Tr "repo.file_history"}} + {{.locale.Tr "repo.unescape_control_characters"}} +
    @@ -46,7 +46,7 @@
    {{if $.EscapeStatus.Escaped}} - + {{end}}
    {{.root.i18n.Tr "packages.dependency.id"}}{{.root.i18n.Tr "packages.dependency.version"}}{{.root.locale.Tr "packages.dependency.id"}}{{.root.locale.Tr "packages.dependency.version"}}
    {{if $row.PreviousSha}} - + {{svg "octicon-versions"}} {{end}} @@ -55,7 +55,7 @@ {{if $row.EscapeStatus.Escaped}}{{end}}{{if $row.EscapeStatus.Escaped}}{{end}} {{$row.Code}} diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index d36a69e5be..82b88a00ba 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -6,7 +6,7 @@ {{template "repo/sub_menu" .}} {{if .DefaultBranchBranch}}

    - {{.i18n.Tr "repo.default_branch"}} + {{.locale.Tr "repo.default_branch"}}

    @@ -18,15 +18,15 @@ {{svg "octicon-shield-lock"}} {{end}} {{.DefaultBranch}} -

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

    +

    {{svg "octicon-git-commit" 16 "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}}

    		 {{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} -
    +
    {{svg "octicon-git-branch"}}
    {{end}} -
    +
    {{svg "octicon-download"}}
    {{svg "octicon-file-zip"}} ZIP @@ -42,7 +42,7 @@ {{if gt (len .Branches) 1}}

    - {{.i18n.Tr "repo.branches"}} + {{.locale.Tr "repo.branches"}}

    @@ -53,13 +53,13 @@ {{if $.EscapeStatus.Escaped}} - + {{end}} @@ -125,14 +125,14 @@
    {{if $.Permission.CanRead $.UnitTypeIssues}}
    - {{.i18n.Tr "repo.issues.context.reference_issue"}} + {{.locale.Tr "repo.issues.context.reference_issue"}}
    {{end}}
    - {{.i18n.Tr "repo.view_git_blame"}} + {{.locale.Tr "repo.view_git_blame"}}
    - {{.i18n.Tr "repo.file_copy_permalink"}} + {{.locale.Tr "repo.file_copy_permalink"}}
    diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 188bb9f3ce..664dfaf9b9 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -34,7 +34,7 @@ {{end}} - + @@ -87,7 +87,7 @@ {{end}} - + {{end}} diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 1f9c3788a2..d3085a1068 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -4,10 +4,10 @@
    {{template "base/alert" .}}
    - {{.i18n.Tr "repo.wiki.new_page"}} + {{.locale.Tr "repo.wiki.new_page"}} {{if .PageIsWikiEdit}}
    - {{.i18n.Tr "repo.wiki.new_page_button"}} + {{.locale.Tr "repo.wiki.new_page_button"}}
    {{end}}
    @@ -17,23 +17,23 @@
    - {{.i18n.Tr "repo.wiki.page_name_desc"}} + {{.locale.Tr "repo.wiki.page_name_desc"}}
    - {{.i18n.Tr "write"}} - {{$.i18n.Tr "preview"}} + {{.locale.Tr "write"}} + {{$.locale.Tr "preview"}}
    -
    +
    - +
    - +
    diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index c680327d8b..3c53fe1e8a 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -4,11 +4,11 @@

    - {{.i18n.Tr "repo.wiki.pages"}} + {{.locale.Tr "repo.wiki.pages"}}
    {{if and .CanWriteWiki (not .IsRepositoryMirror)}} - {{.i18n.Tr "repo.wiki.new_page_button"}} + {{.locale.Tr "repo.wiki.new_page_button"}} {{end}}

    @@ -20,8 +20,8 @@ {{svg "octicon-file"}} {{.Name}} - {{$timeSince := TimeSinceUnix .UpdatedUnix $.i18n}} -
    + {{$timeSince := TimeSinceUnix .UpdatedUnix $.locale}} + {{end}} diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl index 365f565213..577eb6e6c0 100644 --- a/templates/repo/wiki/revision.tmpl +++ b/templates/repo/wiki/revision.tmpl @@ -10,20 +10,20 @@
    - {{.revision}} {{svg "octicon-home"}} + {{.revision}} {{svg "octicon-home"}} {{$title}}
    - {{$timeSince := TimeSince .Author.When $.i18n}} - {{.i18n.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}} + {{$timeSince := TimeSince .Author.When $.locale}} + {{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
    -

    {{.i18n.Tr "repo.wiki.wiki_page_revisions"}}

    +

    {{.locale.Tr "repo.wiki.wiki_page_revisions"}}

    - {{.CommitCount}} {{.i18n.Tr "repo.commits.commits"}} + {{.CommitCount}} {{.locale.Tr "repo.commits.commits"}}

    diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl index 514ac114ad..e353fcab41 100644 --- a/templates/repo/wiki/start.tmpl +++ b/templates/repo/wiki/start.tmpl @@ -4,10 +4,10 @@
    {{svg "octicon-book" 32}} -

    {{.i18n.Tr "repo.wiki.welcome"}}

    -

    {{.i18n.Tr "repo.wiki.welcome_desc"}}

    +

    {{.locale.Tr "repo.wiki.welcome"}}

    +

    {{.locale.Tr "repo.wiki.welcome_desc"}}

    {{if and .CanWriteWiki (not .Repository.IsMirror)}} - {{.i18n.Tr "repo.wiki.create_first_page"}} + {{.locale.Tr "repo.wiki.create_first_page"}} {{end}}
    diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 12318858c9..91a15f19e2 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -6,10 +6,10 @@
    -
    +
    - {{.i18n.Tr "repo.wiki.page"}}: + {{.locale.Tr "repo.wiki.page"}}: {{$title}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -17,7 +17,7 @@
    {{svg "octicon-filter" 16}} - +
    {{range .Pages}} @@ -37,23 +37,23 @@
    - {{.CommitCount}} {{svg "octicon-history"}} + {{.CommitCount}} {{svg "octicon-history"}} {{$title}}
    - {{$timeSince := TimeSince .Author.When $.i18n}} - {{.i18n.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}} + {{$timeSince := TimeSince .Author.When $.locale}} + {{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
    {{if .EscapeStatus.Escaped}} - - {{.i18n.Tr "repo.escape_control_characters"}} + + {{.locale.Tr "repo.escape_control_characters"}} {{end}} {{if and .CanWriteWiki (not .Repository.IsMirror)}}
    - {{.i18n.Tr "repo.wiki.edit_page_button"}} - {{.i18n.Tr "repo.wiki.new_page_button"}} - {{.i18n.Tr "repo.wiki.delete_page_button"}} + {{.locale.Tr "repo.wiki.edit_page_button"}} + {{.locale.Tr "repo.wiki.new_page_button"}} + {{.locale.Tr "repo.wiki.delete_page_button"}}
    {{end}}
    @@ -75,7 +75,7 @@
    -
    {{.i18n.Tr "toc"}}
    +
    {{.locale.Tr "toc"}}
     {{$level := 0}} {{range .toc}} @@ -91,7 +91,7 @@ {{if .sidebarPresent}}
    {{if and .CanWriteWiki (not .Repository.IsMirror)}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} {{template "repo/unicode_escape_prompt" dict "EscapeStatus" .sidebarEscapeStatus "root" $}} {{.sidebarContent | Safe}} @@ -103,7 +103,7 @@ {{if .footerPresent}}
    {{if and .CanWriteWiki (not .Repository.IsMirror)}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} {{template "repo/unicode_escape_prompt" dict "footerEscapeStatus" .sidebarEscapeStatus "root" $}} {{.footerContent | Safe}} @@ -115,10 +115,10 @@
    {{svg "octicon-trash"}} - {{.i18n.Tr "repo.wiki.delete_page_button"}} + {{.locale.Tr "repo.wiki.delete_page_button"}}
    -

    {{.i18n.Tr "repo.wiki.delete_page_notice_1" ($title|Escape) | Safe}}

    +

    {{.locale.Tr "repo.wiki.delete_page_notice_1" ($title|Escape) | Safe}}

    {{template "base/delete_modal_actions" .}}
    diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 25dcc5d458..0adcc34671 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -51,13 +51,13 @@ #{{.Index}} {{end}} - {{ $timeStr := TimeSinceUnix .GetLastEventTimestamp $.i18n }} + {{ $timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale }} {{if .OriginalAuthor }} - {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}} + {{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}} {{else if gt .Poster.ID 0}} - {{$.i18n.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}} + {{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}} {{else}} - {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} + {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} {{end}} {{if .IsPull}}
    @@ -99,7 +99,7 @@ {{end}} {{if ne .DeadlineUnix 0}} - + {{svg "octicon-calendar" 14 "mr-2"}} {{.DeadlineUnix.FormatShort}} @@ -113,25 +113,25 @@ {{if gt $approveOfficial 0}} {{svg "octicon-check" 14 "mr-1"}} - {{$.i18n.TrN $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n" $approveOfficial}} + {{$.locale.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.TrN $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n" $rejectOfficial}} + {{$.locale.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.TrN $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n" $waitingOfficial}} + {{$.locale.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.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}} + {{$.locale.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}} {{end}} {{end}} @@ -163,7 +163,7 @@ {{end}} {{if .IssueIndexerUnavailable}}
    -

    {{$.i18n.Tr "repo.issues.keyword_search_unavailable"}}

    +

    {{$.locale.Tr "repo.issues.keyword_search_unavailable"}}

    {{end}}
    diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl index bb38210eca..9a008cc31e 100644 --- a/templates/shared/searchbottom.tmpl +++ b/templates/shared/searchbottom.tmpl @@ -6,7 +6,7 @@
    {{if not .result.UpdatedUnix.IsZero}} - {{.root.i18n.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix .root.i18n) | Safe}} + {{.root.locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix .root.locale) | Safe}} {{end}}
    diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl index 728e5b272c..571124016b 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -5,8 +5,8 @@

    404


    -

    {{.i18n.Tr "error404" | Safe}} - {{if .ShowFooterVersion}}

    {{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}

    {{end}} +

    {{.locale.Tr "error404" | Safe}} + {{if .ShowFooterVersion}}

    {{.locale.Tr "admin.config.app_ver"}}: {{AppVer}}

    {{end}}
    {{template "base/footer" .}} diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index 43ff2c12e8..4aaf8f50f0 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -4,10 +4,10 @@

    {{if .ErrorMsg}} -

    {{.i18n.Tr "error.occurred"}}:

    +

    {{.locale.Tr "error.occurred"}}:

    {{.ErrorMsg}}
    {{end}} - {{if .ShowFooterVersion}}

    {{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}

    {{end}} - {{if .IsAdmin}}

    {{.i18n.Tr "error.report_message" | Safe}}

    {{end}} + {{if .ShowFooterVersion}}

    {{.locale.Tr "admin.config.app_ver"}}: {{AppVer}}

    {{end}} + {{if .IsAdmin}}

    {{.locale.Tr "error.report_message" | Safe}}

    {{end}}
    {{template "base/footer" .}} diff --git a/templates/swagger/ui.tmpl b/templates/swagger/ui.tmpl index d665a273c3..1791e234ea 100644 --- a/templates/swagger/ui.tmpl +++ b/templates/swagger/ui.tmpl @@ -6,7 +6,7 @@ - {{svg "octicon-reply"}}{{.i18n.Tr "return_to_gitea"}} + {{svg "octicon-reply"}}{{.locale.Tr "return_to_gitea"}}
    diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index bb5d2a16f3..eba9e3229b 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -5,40 +5,40 @@
    {{.CsrfTokenHtml}}

    - {{.i18n.Tr "auth.active_your_account"}} + {{.locale.Tr "auth.active_your_account"}}

    {{template "base/alert" .}} {{if .IsActivatePage}} {{if .ServiceNotEnabled}} -

    {{.i18n.Tr "auth.disable_register_mail"}}

    +

    {{.locale.Tr "auth.disable_register_mail"}}

    {{else if .ResendLimited}} -

    {{.i18n.Tr "auth.resent_limit_prompt"}}

    +

    {{.locale.Tr "auth.resent_limit_prompt"}}

    {{else}} -

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" (.SignedUser.Email|Escape) .ActiveCodeLives | Str2html}}

    +

    {{.locale.Tr "auth.confirmation_mail_sent_prompt" (.SignedUser.Email|Escape) .ActiveCodeLives | Str2html}}

    {{end}} {{else}} {{if .NeedsPassword}}
    - +
    - +
    {{else if .IsSendRegisterMail}} -

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" (.Email|Escape) .ActiveCodeLives | Str2html}}

    +

    {{.locale.Tr "auth.confirmation_mail_sent_prompt" (.Email|Escape) .ActiveCodeLives | Str2html}}

    {{else if .IsActivateFailed}} -

    {{.i18n.Tr "auth.invalid_code"}}

    +

    {{.locale.Tr "auth.invalid_code"}}

    {{else if .ManualActivationOnly}} -

    {{.i18n.Tr "auth.manual_activation_only"}}

    +

    {{.locale.Tr "auth.manual_activation_only"}}

    {{else}} -

    {{.i18n.Tr "auth.has_unconfirmed_mail" (.SignedUser.Name|Escape) (.SignedUser.Email|Escape) | Str2html}}

    +

    {{.locale.Tr "auth.has_unconfirmed_mail" (.SignedUser.Name|Escape) (.SignedUser.Email|Escape) | Str2html}}

    - +
    {{end}} {{end}} diff --git a/templates/user/auth/change_passwd_inner.tmpl b/templates/user/auth/change_passwd_inner.tmpl index 43818e93d2..49ae608053 100644 --- a/templates/user/auth/change_passwd_inner.tmpl +++ b/templates/user/auth/change_passwd_inner.tmpl @@ -2,25 +2,25 @@ {{template "base/alert" .}} {{end}}

    - {{.i18n.Tr "settings.change_password"}} + {{.locale.Tr "settings.change_password"}}

    {{.CsrfTokenHtml}}
    - +
    - +
    - +
    diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl index 57e9d14ed4..39163b30be 100644 --- a/templates/user/auth/finalize_openid.tmpl +++ b/templates/user/auth/finalize_openid.tmpl @@ -6,36 +6,36 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "auth.login_userpass"}} + {{.locale.Tr "auth.login_userpass"}}

    {{.CsrfTokenHtml}}
    - +
    - +
    - +
    - - {{.i18n.Tr "auth.forget_password"}} + + {{.locale.Tr "auth.forget_password"}}
    {{if .ShowRegistrationButton}}
    - {{.i18n.Tr "auth.sign_up_now" | Str2html}} + {{.locale.Tr "auth.sign_up_now" | Str2html}}
    {{end}} diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index 59789ef7cb..cd42085e28 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -5,32 +5,32 @@
    {{.CsrfTokenHtml}}

    - {{.i18n.Tr "auth.forgot_password_title"}} + {{.locale.Tr "auth.forgot_password_title"}}

    {{template "base/alert" .}} {{if .IsResetSent}} -

    {{.i18n.Tr "auth.reset_password_mail_sent_prompt" (Escape .Email) .ResetPwdCodeLives | Str2html}}

    +

    {{.locale.Tr "auth.reset_password_mail_sent_prompt" (Escape .Email) .ResetPwdCodeLives | Str2html}}

    {{else if .IsResetRequest}}
    - +
    - +
    {{else if .IsResetDisable}}

    {{if $.IsAdmin}} - {{.i18n.Tr "auth.disable_forgot_password_mail_admin"}} + {{.locale.Tr "auth.disable_forgot_password_mail_admin"}} {{else}} - {{.i18n.Tr "auth.disable_forgot_password_mail"}} + {{.locale.Tr "auth.disable_forgot_password_mail"}} {{end}}

    {{else if .ResendLimited}} -

    {{.i18n.Tr "auth.resent_limit_prompt"}}

    +

    {{.locale.Tr "auth.resent_limit_prompt"}}

    {{end}}
    diff --git a/templates/user/auth/grant.tmpl b/templates/user/auth/grant.tmpl index 0f072bcf13..0ba32c550f 100644 --- a/templates/user/auth/grant.tmpl +++ b/templates/user/auth/grant.tmpl @@ -3,17 +3,17 @@

    - {{.i18n.Tr "auth.authorize_title" .Application.Name}} + {{.locale.Tr "auth.authorize_title" .Application.Name}}

    {{template "base/alert" .}}

    - {{.i18n.Tr "auth.authorize_application_description"}}
    - {{.i18n.Tr "auth.authorize_application_created_by" .ApplicationUserLinkHTML | Str2html}} + {{.locale.Tr "auth.authorize_application_description"}}
    + {{.locale.Tr "auth.authorize_application_created_by" .ApplicationUserLinkHTML | Str2html}}

    -

    {{.i18n.Tr "auth.authorize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}

    +

    {{.locale.Tr "auth.authorize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}

    @@ -23,7 +23,7 @@ - + Cancel
    diff --git a/templates/user/auth/grant_error.tmpl b/templates/user/auth/grant_error.tmpl index 83bd882178..2173a3311b 100644 --- a/templates/user/auth/grant_error.tmpl +++ b/templates/user/auth/grant_error.tmpl @@ -4,11 +4,11 @@

    - {{.i18n.Tr "auth.authorization_failed" }} + {{.locale.Tr "auth.authorization_failed" }}

    {{.Error.ErrorDescription}}

    -

    {{.i18n.Tr "auth.authorization_failed_desc"}}

    +

    {{.locale.Tr "auth.authorization_failed_desc"}}

    diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl index dfc70b1ae6..4525bf551a 100644 --- a/templates/user/auth/link_account.tmpl +++ b/templates/user/auth/link_account.tmpl @@ -6,12 +6,12 @@ {{if not .AllowOnlyInternalRegistration}} - {{.i18n.Tr "auth.oauth_signup_tab"}} + {{.locale.Tr "auth.oauth_signup_tab"}} {{end}} - {{.i18n.Tr "auth.oauth_signin_tab"}} + {{.locale.Tr "auth.oauth_signin_tab"}}
    diff --git a/templates/user/auth/prohibit_login.tmpl b/templates/user/auth/prohibit_login.tmpl index b773ef16e6..d002ad7ae0 100644 --- a/templates/user/auth/prohibit_login.tmpl +++ b/templates/user/auth/prohibit_login.tmpl @@ -4,10 +4,10 @@

    - {{.i18n.Tr "auth.prohibit_login"}} + {{.locale.Tr "auth.prohibit_login"}}

    -

    {{.i18n.Tr "auth.prohibit_login_desc"}}

    +

    {{.locale.Tr "auth.prohibit_login_desc"}}

    diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl index 66d4ffc115..bba7b2bc4b 100644 --- a/templates/user/auth/reset_passwd.tmpl +++ b/templates/user/auth/reset_passwd.tmpl @@ -6,44 +6,44 @@ {{.CsrfTokenHtml}}

    - {{.i18n.Tr "auth.reset_password"}} + {{.locale.Tr "auth.reset_password"}}

    {{template "base/alert" .}} {{if .user_email }}
    - +
    {{end}} {{if .IsResetForm}}
    - +
    {{if not .user_signed_in}}
    - +
    {{end}} {{if .has_two_factor}}

    - {{.i18n.Tr "twofa"}} + {{.locale.Tr "twofa"}}

    -
    {{.i18n.Tr "settings.twofa_is_enrolled" | Str2html }}
    +
    {{.locale.Tr "settings.twofa_is_enrolled" | Str2html }}
    {{if .scratch_code}}
    - +
    {{else}}
    - +
    {{end}} @@ -51,13 +51,13 @@
    - + {{if and .has_two_factor (not .scratch_code)}} - {{.i18n.Tr "auth.use_scratch_code" | Str2html}} + {{.locale.Tr "auth.use_scratch_code" | Str2html}} {{end}}
    {{else}} -

    {{.i18n.Tr "auth.invalid_code"}}

    +

    {{.locale.Tr "auth.invalid_code"}}

    {{end}}
    diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index 20a286aacb..18875f45a3 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -3,21 +3,21 @@ {{end}}

    {{if .LinkAccountMode}} - {{.i18n.Tr "auth.oauth_signin_title"}} + {{.locale.Tr "auth.oauth_signin_title"}} {{else}} - {{.i18n.Tr "auth.login_userpass"}} + {{.locale.Tr "auth.login_userpass"}} {{end}}

    {{.CsrfTokenHtml}}
    - +
    {{if or (not .DisablePassword) .LinkAccountMode}}
    - +
    {{end}} @@ -25,7 +25,7 @@
    - +
    @@ -35,18 +35,18 @@ - {{.i18n.Tr "auth.forgot_password"}} + {{.locale.Tr "auth.forgot_password"}}
    {{if .ShowRegistrationButton}}
    - {{.i18n.Tr "auth.sign_up_now" | Str2html}} + {{.locale.Tr "auth.sign_up_now" | Str2html}}
    {{end}} @@ -56,7 +56,7 @@
    -

    {{.i18n.Tr "sign_in_with"}}

    +

    {{.locale.Tr "sign_in_with"}}

    {{range $key := .OrderedOAuth2Names}} {{$provider := index $.OAuth2Providers $key}} diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl index 464dec8193..e77dc42d50 100644 --- a/templates/user/auth/signin_navbar.tmpl +++ b/templates/user/auth/signin_navbar.tmpl @@ -2,7 +2,7 @@
    - {{.i18n.Tr "auth.login_userpass"}} + {{.locale.Tr "auth.login_userpass"}} {{if .EnableOpenIDSignIn}} diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl index b7d9b9f636..87004eda92 100644 --- a/templates/user/auth/signin_openid.tmpl +++ b/templates/user/auth/signin_openid.tmpl @@ -11,7 +11,7 @@ {{.CsrfTokenHtml}}
    - {{.i18n.Tr "auth.openid_signin_desc"}} + {{.locale.Tr "auth.openid_signin_desc"}}
    diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index cbfb95e444..356c3e1cdc 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -1,9 +1,9 @@

    {{if .LinkAccountMode}} - {{.i18n.Tr "auth.oauth_signup_title"}} + {{.locale.Tr "auth.oauth_signup_title"}} {{else}} - {{.i18n.Tr "sign_up"}} + {{.locale.Tr "sign_up"}} {{end}}

    @@ -13,24 +13,24 @@ {{template "base/alert" .}} {{end}} {{if .DisableRegistration}} -

    {{.i18n.Tr "auth.disable_register_prompt"}}

    +

    {{.locale.Tr "auth.disable_register_prompt"}}

    {{else}}
    - +
    - +
    {{if not .DisablePassword}}
    - +
    - +
    {{end}} @@ -40,7 +40,7 @@ {{.Captcha.CreateHTML}}
    - +
    {{end}} @@ -59,9 +59,9 @@
    @@ -69,7 +69,7 @@ {{if not .LinkAccountMode}}
    - {{.i18n.Tr "auth.register_helper_msg"}} + {{.locale.Tr "auth.register_helper_msg"}}
    {{end}} {{end}} diff --git a/templates/user/auth/signup_openid_connect.tmpl b/templates/user/auth/signup_openid_connect.tmpl index de97876190..b023ca1125 100644 --- a/templates/user/auth/signup_openid_connect.tmpl +++ b/templates/user/auth/signup_openid_connect.tmpl @@ -4,20 +4,20 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "auth.openid_connect_title"}} + {{.locale.Tr "auth.openid_connect_title"}}

    - {{.i18n.Tr "auth.openid_connect_desc"}} + {{.locale.Tr "auth.openid_connect_desc"}}

    {{.CsrfTokenHtml}}
    - +
    - +
    @@ -26,8 +26,8 @@
    - - {{.i18n.Tr "auth.forgot_password"}} + + {{.locale.Tr "auth.forgot_password"}}
    diff --git a/templates/user/auth/signup_openid_navbar.tmpl b/templates/user/auth/signup_openid_navbar.tmpl index b033022a8e..a62c23ef25 100644 --- a/templates/user/auth/signup_openid_navbar.tmpl +++ b/templates/user/auth/signup_openid_navbar.tmpl @@ -1,11 +1,11 @@
    - {{.i18n.Tr "auth.openid_connect_title"}} + {{.locale.Tr "auth.openid_connect_title"}} {{if and .EnableOpenIDSignUp (not .AllowOnlyInternalRegistration)}} - {{.i18n.Tr "auth.openid_register_title"}} + {{.locale.Tr "auth.openid_register_title"}} {{end}}
    diff --git a/templates/user/auth/signup_openid_register.tmpl b/templates/user/auth/signup_openid_register.tmpl index 90af77476b..5edd7966ff 100644 --- a/templates/user/auth/signup_openid_register.tmpl +++ b/templates/user/auth/signup_openid_register.tmpl @@ -4,20 +4,20 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "auth.openid_register_title"}} + {{.locale.Tr "auth.openid_register_title"}}

    - {{.i18n.Tr "auth.openid_register_desc"}} + {{.locale.Tr "auth.openid_register_desc"}}

    {{.CsrfTokenHtml}}
    - +
    - +
    {{if and .EnableCaptcha (eq .CaptchaType "image")}} @@ -26,7 +26,7 @@ {{.Captcha.CreateHTML}}
    - +
    {{end}} @@ -46,7 +46,7 @@
    - +
    diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl index a9ed66c431..5c735b27b6 100644 --- a/templates/user/auth/twofa.tmpl +++ b/templates/user/auth/twofa.tmpl @@ -5,19 +5,19 @@
    {{.CsrfTokenHtml}}

    - {{.i18n.Tr "twofa"}} + {{.locale.Tr "twofa"}}

    {{template "base/alert" .}}
    - +
    - - {{.i18n.Tr "auth.use_scratch_code" | Str2html}} + + {{.locale.Tr "auth.use_scratch_code" | Str2html}}
    diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl index 44022300c3..bb3bbaa07f 100644 --- a/templates/user/auth/twofa_scratch.tmpl +++ b/templates/user/auth/twofa_scratch.tmpl @@ -5,18 +5,18 @@
    {{.CsrfTokenHtml}}

    - {{.i18n.Tr "twofa_scratch"}} + {{.locale.Tr "twofa_scratch"}}

    {{template "base/alert" .}}
    - +
    - +
    diff --git a/templates/user/auth/webauthn.tmpl b/templates/user/auth/webauthn.tmpl index 17c9a5f580..8e82c12fc0 100644 --- a/templates/user/auth/webauthn.tmpl +++ b/templates/user/auth/webauthn.tmpl @@ -3,17 +3,17 @@

    - {{.i18n.Tr "twofa"}} + {{.locale.Tr "twofa"}}

    -

    {{.i18n.Tr "webauthn_insert_key"}}

    +

    {{.locale.Tr "webauthn_insert_key"}}

    {{template "base/alert" .}} -

    {{.i18n.Tr "webauthn_sign_in"}}

    +

    {{.locale.Tr "webauthn_sign_in"}}

    -
    {{.i18n.Tr "webauthn_press_button"}}
    +
    {{.locale.Tr "webauthn_press_button"}}
    - {{.i18n.Tr "webauthn_use_twofa"}} + {{.locale.Tr "webauthn_use_twofa"}}
    diff --git a/templates/user/auth/webauthn_error.tmpl b/templates/user/auth/webauthn_error.tmpl index 6f2980df7c..c3cae710f1 100644 --- a/templates/user/auth/webauthn_error.tmpl +++ b/templates/user/auth/webauthn_error.tmpl @@ -1,22 +1,22 @@ diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index d3a8afcb55..95e2239257 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -13,71 +13,71 @@ {{.ShortActUserName}} {{end}} {{if eq .GetOpType 1}} - {{$.i18n.Tr "action.create_repo" (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.create_repo" (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 2}} - {{$.i18n.Tr "action.rename_repo" (.GetContent|Escape) (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.rename_repo" (.GetContent|Escape) (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 5}} {{if .Content}} - {{$.i18n.Tr "action.commit_repo" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.commit_repo" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}} {{else}} - {{$.i18n.Tr "action.create_branch" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.create_branch" (.GetRepoLink|Escape) (.GetRefLink|Escape) (Escape .GetBranch) (.ShortRepoPath|Escape) | Str2html}} {{end}} {{else if eq .GetOpType 6}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.create_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.create_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 7}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.create_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.create_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 8}} - {{$.i18n.Tr "action.transfer_repo" .GetContent (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.transfer_repo" .GetContent (.GetRepoLink|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 9}} - {{$.i18n.Tr "action.push_tag" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.push_tag" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 10}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.comment_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.comment_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 11}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.merge_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.merge_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 12}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.close_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.close_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 13}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.reopen_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.reopen_issue" ((printf "%s/issues/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 14}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.close_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.close_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 15}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.reopen_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.reopen_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 16}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.delete_tag" (.GetRepoLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.delete_tag" (.GetRepoLink|Escape) (.GetTag|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 17}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.delete_branch" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.delete_branch" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 18}} - {{$.i18n.Tr "action.mirror_sync_push" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.mirror_sync_push" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 19}} - {{$.i18n.Tr "action.mirror_sync_create" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.mirror_sync_create" (.GetRepoLink|Escape) (.GetRefLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 20}} - {{$.i18n.Tr "action.mirror_sync_delete" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.mirror_sync_delete" (.GetRepoLink|Escape) (.GetBranch|Escape) (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 21}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.approve_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.approve_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 22}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.reject_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.reject_pull_request" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 23}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.comment_pull" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} + {{$.locale.Tr "action.comment_pull" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 24}} {{ $linkText := .Content | RenderEmoji }} - {{$.i18n.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/releases/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}} + {{$.locale.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/releases/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}} {{else if eq .GetOpType 25}} {{ $index := index .GetIssueInfos 0}} {{ $reviewer := index .GetIssueInfos 1}} - {{$.i18n.Tr "action.review_dismissed" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) $reviewer | Str2html}} + {{$.locale.Tr "action.review_dismissed" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) $reviewer | Str2html}} {{end}}

    {{if or (eq .GetOpType 5) (eq .GetOpType 18)}} @@ -95,7 +95,7 @@ {{end}} - {{if and (gt $push.Len 1) $push.CompareURL}}
  • {{$.i18n.Tr "action.compare_commits" $push.Len}} »
    • {{end}} + {{if and (gt $push.Len 1) $push.CompareURL}}
  • {{$.locale.Tr "action.compare_commits" $push.Len}} »
    • {{end}}
    {{else if eq .GetOpType 6}} @@ -111,10 +111,10 @@ {{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}} {{.GetIssueTitle | RenderEmoji}} {{else if eq .GetOpType 25}} -

    {{$.i18n.Tr "action.review_dismissed_reason"}}

    +

    {{$.locale.Tr "action.review_dismissed_reason"}}

    {{index .GetIssueInfos 2 | RenderEmoji}}

    {{end}} -

    {{TimeSince .GetCreate $.i18n}}

    +

    {{TimeSince .GetCreate $.locale}}

    diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 9024d9ede6..b2f4863d6c 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -6,24 +6,24 @@
    - {{.i18n.Tr "home.issues.in_your_repos"}} + {{.locale.Tr "home.issues.in_your_repos"}} {{CountFmt .IssueStats.YourRepositoriesCount}} - {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} + {{.locale.Tr "repo.issues.filter_type.assigned_to_you"}} {{CountFmt .IssueStats.AssignCount}} - {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} + {{.locale.Tr "repo.issues.filter_type.created_by_you"}} {{CountFmt .IssueStats.CreateCount}} - {{.i18n.Tr "repo.issues.filter_type.mentioning_you"}} + {{.locale.Tr "repo.issues.filter_type.mentioning_you"}} {{CountFmt .IssueStats.MentionCount}} {{if .PageIsPulls}} - {{.i18n.Tr "repo.issues.filter_type.review_requested"}} + {{.locale.Tr "repo.issues.filter_type.review_requested"}} {{CountFmt .IssueStats.ReviewRequestedCount}} {{end}} @@ -61,11 +61,11 @@
    {{svg "octicon-issue-opened" 16 "mr-3"}} - {{JsPrettyNumber .IssueStats.OpenCount}} {{.i18n.Tr "repo.issues.open_title"}} + {{JsPrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} {{svg "octicon-issue-closed" 16 "mr-3"}} - {{JsPrettyNumber .IssueStats.ClosedCount}} {{.i18n.Tr "repo.issues.closed_title"}} + {{JsPrettyNumber .IssueStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}}
    @@ -76,8 +76,8 @@ - - + +
    @@ -85,18 +85,18 @@
    - {{.i18n.Tr "repo.issues.filter_sort"}} + {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.mostcomment"}} - {{.i18n.Tr "repo.issues.filter_sort.leastcomment"}} - {{.i18n.Tr "repo.issues.filter_sort.nearduedate"}} - {{.i18n.Tr "repo.issues.filter_sort.farduedate"}} + {{.locale.Tr "repo.issues.filter_sort.latest"}} + {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{.locale.Tr "repo.issues.filter_sort.mostcomment"}} + {{.locale.Tr "repo.issues.filter_sort.leastcomment"}} + {{.locale.Tr "repo.issues.filter_sort.nearduedate"}} + {{.locale.Tr "repo.issues.filter_sort.farduedate"}}
    diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index f231d52215..9044c7a2a4 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -6,7 +6,7 @@
    - {{.i18n.Tr "home.issues.in_your_repos"}} + {{.locale.Tr "home.issues.in_your_repos"}} {{.Total}}
    @@ -39,11 +39,11 @@
    {{svg "octicon-milestone" 16 "mr-3"}} - {{JsPrettyNumber .MilestoneStats.OpenCount}} {{.i18n.Tr "repo.issues.open_title"}} + {{JsPrettyNumber .MilestoneStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} {{svg "octicon-check" 16 "mr-3"}} - {{JsPrettyNumber .MilestoneStats.ClosedCount}} {{.i18n.Tr "repo.issues.closed_title"}} + {{JsPrettyNumber .MilestoneStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}}
    @@ -54,8 +54,8 @@ - - + +
    @@ -63,16 +63,16 @@
    - {{.i18n.Tr "repo.issues.filter_sort"}} + {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{.i18n.Tr "repo.milestones.filter_sort.closest_due_date"}} - {{.i18n.Tr "repo.milestones.filter_sort.furthest_due_date"}} - {{.i18n.Tr "repo.milestones.filter_sort.least_complete"}} - {{.i18n.Tr "repo.milestones.filter_sort.most_complete"}} - {{.i18n.Tr "repo.milestones.filter_sort.most_issues"}} - {{.i18n.Tr "repo.milestones.filter_sort.least_issues"}} + {{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}} + {{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}} + {{.locale.Tr "repo.milestones.filter_sort.least_complete"}} + {{.locale.Tr "repo.milestones.filter_sort.most_complete"}} + {{.locale.Tr "repo.milestones.filter_sort.most_issues"}} + {{.locale.Tr "repo.milestones.filter_sort.least_issues"}}
    @@ -91,22 +91,22 @@
    - {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.i18n }} + {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.locale }} {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate|Str2html}} {{else}} {{svg "octicon-calendar"}} {{if .DeadlineString}} {{.DeadlineString}} {{else}} - {{$.i18n.Tr "repo.milestones.no_due_date"}} + {{$.locale.Tr "repo.milestones.no_due_date"}} {{end}} {{end}} {{svg "octicon-issue-opened" 16 "mr-3"}} - {{JsPrettyNumber .NumOpenIssues}} {{$.i18n.Tr "repo.issues.open_title"}} + {{JsPrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} {{svg "octicon-check" 16 "mr-3"}} - {{JsPrettyNumber .NumClosedIssues}} {{$.i18n.Tr "repo.issues.closed_title"}} + {{JsPrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} {{if .TotalTrackedTime}} {{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}} {{end}} @@ -114,13 +114,13 @@
    {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
    - {{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}} + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} - {{svg "octicon-check"}} {{$.i18n.Tr "repo.milestones.open"}} + {{svg "octicon-check"}} {{$.locale.Tr "repo.milestones.open"}} {{else}} - {{svg "octicon-x"}} {{$.i18n.Tr "repo.milestones.close"}} + {{svg "octicon-x"}} {{$.locale.Tr "repo.milestones.close"}} {{end}} - {{svg "octicon-trash"}} {{$.i18n.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}
    {{end}} {{if .Content}} diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 75abe859ec..685c1a58e2 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -7,15 +7,15 @@ {{.ContextUser.ShortName 40}} {{if .ContextUser.IsOrganization}} - {{if .ContextUser.Visibility.IsLimited}}
    {{.i18n.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} - {{if .ContextUser.Visibility.IsPrivate}}
    {{.i18n.Tr "org.settings.visibility.private_shortname"}}
    {{end}} + {{if .ContextUser.Visibility.IsLimited}}
    {{.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} + {{if .ContextUser.Visibility.IsPrivate}}
    {{.locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}}     {{end}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{.i18n.Tr "home.switch_dashboard_context"}} + {{.locale.Tr "home.switch_dashboard_context"}}
    @@ -27,15 +27,15 @@ {{avatar .}} {{.ShortName 40}} - {{if .Visibility.IsLimited}}
    {{$.i18n.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} - {{if .Visibility.IsPrivate}}
    {{$.i18n.Tr "org.settings.visibility.private_shortname"}}
    {{end}} + {{if .Visibility.IsLimited}}
    {{$.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} + {{if .Visibility.IsPrivate}}
    {{$.locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}}     {{end}}
    {{if .SignedUser.CanCreateOrganization}} - {{svg "octicon-plus"}}   {{.i18n.Tr "new_org"}} + {{svg "octicon-plus"}}   {{.locale.Tr "new_org"}} {{end}}
    @@ -49,17 +49,17 @@ {{if .Team}} {{.Team.Name}} {{else}} - {{.i18n.Tr "org.teams"}} + {{.locale.Tr "org.teams"}} {{end}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{.i18n.Tr "home.filter_by_team_repositories"}} + {{.locale.Tr "home.filter_by_team_repositories"}}
    - - {{.i18n.Tr "all"}} + + {{.locale.Tr "all"}} {{range .Teams}} {{if not .IncludesAllRepositories}} @@ -77,26 +77,26 @@ {{if .ContextUser.IsOrganization}}
    - {{svg "octicon-rss"}} {{.i18n.Tr "activities"}} + {{svg "octicon-rss"}} {{.locale.Tr "activities"}} {{if not .UnitIssuesGlobalDisabled}} - {{svg "octicon-issue-opened"}} {{.i18n.Tr "issues"}} + {{svg "octicon-issue-opened"}} {{.locale.Tr "issues"}} {{end}} {{if not .UnitPullsGlobalDisabled}} - {{svg "octicon-git-pull-request"}} {{.i18n.Tr "pull_requests"}} + {{svg "octicon-git-pull-request"}} {{.locale.Tr "pull_requests"}} {{end}} {{if and .ShowMilestonesDashboardPage (not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled))}} - {{svg "octicon-milestone"}} {{.i18n.Tr "milestones"}} + {{svg "octicon-milestone"}} {{.locale.Tr "milestones"}} {{end}}
    - - {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 40)}} + + {{.locale.Tr "home.view_home" (.ContextUser.ShortName 40)}}
    diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index b2f936402d..3e9ff99692 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -22,73 +22,73 @@ >
    - {{.i18n.Tr "repository"}} - {{.i18n.Tr "organization"}} + {{.locale.Tr "repository"}} + {{.locale.Tr "organization"}}

    - {{.i18n.Tr "home.my_repos"}} + {{.locale.Tr "home.my_repos"}} ${reposTotalCount}
    - + {{svg "octicon-plus"}} - {{.i18n.Tr "new_repo"}} + {{.locale.Tr "new_repo"}}

    - + {{svg "octicon-search" 16}} -
    +
    {{svg "octicon-filter" 16}}
    -
    +
    -
    +
    -
    -
    +
    -
    +
    -
    - {{.i18n.Tr "all"}} + {{.locale.Tr "all"}}
    ${repoTypeCount}
     - {{.i18n.Tr "sources"}} + {{.locale.Tr "sources"}}
    ${repoTypeCount}
     - {{.i18n.Tr "forks"}} + {{.locale.Tr "forks"}}
    ${repoTypeCount}
     {{if .MirrorsEnabled}} - {{.i18n.Tr "mirrors"}} + {{.locale.Tr "mirrors"}}
    ${repoTypeCount}
     {{end}} - {{.i18n.Tr "collaborative"}} + {{.locale.Tr "collaborative"}}
    ${repoTypeCount}
    @@ -144,20 +144,20 @@
    @@ -167,12 +167,12 @@

    - {{.i18n.Tr "home.my_orgs"}} + {{.locale.Tr "home.my_orgs"}} ${organizationsTotalCount}
    - + {{svg "octicon-plus"}} - {{.i18n.Tr "new_org"}} + {{.locale.Tr "new_org"}}

    diff --git a/templates/user/heatmap.tmpl b/templates/user/heatmap.tmpl index a569405d16..9d58bc8fc5 100644 --- a/templates/user/heatmap.tmpl +++ b/templates/user/heatmap.tmpl @@ -1,7 +1,7 @@ {{if .HeatmapData}}
    -
    {{.i18n.Tr "user.heatmap.loading"}}
    +
    {{.locale.Tr "user.heatmap.loading"}}
    diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 67193169d9..6dce7f751b 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -1,20 +1,20 @@
    -

    {{.i18n.Tr "notification.notifications"}}

    +

    {{.locale.Tr "notification.notifications"}}

    {{ $notificationUnreadCount := call .NotificationUnreadCount}} - {{.i18n.Tr "notification.unread"}} + {{.locale.Tr "notification.unread"}}
    {{$notificationUnreadCount}}
     - {{.i18n.Tr "notification.read"}} + {{.locale.Tr "notification.read"}} {{if and (eq .Status 1)}}
    {{$.CsrfTokenHtml}}
    -
    @@ -24,9 +24,9 @@
    {{if eq (len .Notifications) 0}} {{if eq .Status 1}} - {{.i18n.Tr "notification.no_unread"}} + {{.locale.Tr "notification.no_unread"}} {{else}} - {{.i18n.Tr "notification.no_read"}} + {{.locale.Tr "notification.no_read"}} {{end}} {{else}}
    {{if .IsDeleted}} {{.Name}} -

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

    +

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

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

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

    +

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

    {{end}}     		@@ -79,39 +79,39 @@ {{if not .LatestPullRequest}} {{if .IsIncluded}} - - {{svg "octicon-git-pull-request"}} {{$.i18n.Tr "repo.branch.included"}} + + {{svg "octicon-git-pull-request"}} {{$.locale.Tr "repo.branch.included"}} {{else if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} - + {{end}} {{else if and .LatestPullRequest.HasMerged .MergeMovedOn}} {{if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} - + {{end}} {{else}} {{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}} {{if .LatestPullRequest.HasMerged}} - {{svg "octicon-git-merge" 16 "mr-2"}}{{$.i18n.Tr "repo.pulls.merged"}} + {{svg "octicon-git-merge" 16 "mr-2"}}{{$.locale.Tr "repo.pulls.merged"}} {{else if .LatestPullRequest.Issue.IsClosed}} - {{svg "octicon-git-pull-request" 16 "mr-2"}}{{$.i18n.Tr "repo.issues.closed_title"}} + {{svg "octicon-git-pull-request" 16 "mr-2"}}{{$.locale.Tr "repo.issues.closed_title"}} {{else}} - {{svg "octicon-git-pull-request" 16 "mr-2"}}{{$.i18n.Tr "repo.issues.open_title"}} + {{svg "octicon-git-pull-request" 16 "mr-2"}}{{$.locale.Tr "repo.issues.open_title"}} {{end}} {{end}} {{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} -
    +
    {{svg "octicon-git-branch"}}
    {{end}} {{if (not .IsDeleted)}} -
    +
    {{svg "octicon-download"}}
    {{svg "octicon-file-zip"}} ZIP @@ -121,9 +121,9 @@ {{end}} {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} {{if .IsDeleted}} - {{svg "octicon-reply"}} + {{svg "octicon-reply"}} {{else}} - + {{svg "octicon-trash"}} {{end}} @@ -143,35 +143,35 @@
    {{svg "octicon-trash"}} - {{.i18n.Tr "repo.branch.delete_html"}} + {{.locale.Tr "repo.branch.delete_html"}}
    -

    {{.i18n.Tr "repo.branch.delete_desc" | Str2html}}

    +

    {{.locale.Tr "repo.branch.delete_desc" | Str2html}}

    {{template "base/delete_modal_actions" .}}
    {{if (index $.LineEscapeStatus $idx).Escaped}}{{end}}{{if (index $.LineEscapeStatus $idx).Escaped}}{{end}}{{$code | Safe}}
    {{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When $.i18n}}{{end}}{{end}}{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When $.locale}}{{end}}{{end}}
    {{if $commit}}{{TimeSince $commit.Committer.When $.i18n}}{{end}}{{if $commit}}{{TimeSince $commit.Committer.When $.locale}}{{end}}
    {{$.i18n.Tr "repo.wiki.last_updated" $timeSince | Safe}}{{$.locale.Tr "repo.wiki.last_updated" $timeSince | Safe}}
    @@ -79,7 +79,7 @@ {{$.CsrfTokenHtml}} - + {{else}} {{$.CsrfTokenHtml}} - + {{end}} @@ -91,26 +91,26 @@
    - {{svg "octicon-repo"}} {{.i18n.Tr "user.repositories"}} + {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} {{if .IsPackageEnabled}} - {{svg "octicon-package"}} {{.i18n.Tr "packages.title"}} + {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} {{end}} - {{svg "octicon-rss"}} {{.i18n.Tr "user.activity"}} + {{svg "octicon-rss"}} {{.locale.Tr "user.activity"}} {{if not .DisableStars}} - {{svg "octicon-star"}} {{.i18n.Tr "user.starred"}} + {{svg "octicon-star"}} {{.locale.Tr "user.starred"}} {{if .Owner.NumStars}}
    {{.Owner.NumStars}}
    {{end}}     {{else}} - {{svg "octicon-eye"}} {{.i18n.Tr "user.watched"}} + {{svg "octicon-eye"}} {{.locale.Tr "user.watched"}} {{end}}
    @@ -118,7 +118,7 @@ {{if eq .TabName "activity"}} {{if .Owner.KeepActivityPrivate}}
    -

    {{.i18n.Tr "user.disabled_public_activity"}}

    +

    {{.locale.Tr "user.disabled_public_activity"}}

    {{end}} {{template "user/heatmap" .}} diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl index a385e0bdc5..b03787e5ef 100644 --- a/templates/user/project.tmpl +++ b/templates/user/project.tmpl @@ -5,12 +5,12 @@
    {{.CsrfTokenHtml}}

    - {{.i18n.Tr "new_project"}} + {{.locale.Tr "new_project"}}

    {{template "base/alert" .}}
    - +
    @@ -34,22 +34,22 @@
    - - + +
    - +
    - +
    -
    {{.i18n.Tr "repo.projects.template.desc_helper"}}
    +
    {{.locale.Tr "repo.projects.template.desc_helper"}}
    {{range $element := .ProjectTypes}} -
    {{$.i18n.Tr $element.Translation}}
    +
    {{$.locale.Tr $element.Translation}}
    {{end}}
    @@ -58,9 +58,9 @@
    - {{.i18n.Tr "cancel"}} + {{.locale.Tr "cancel"}}
    diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 1b3fd136de..326a8cb512 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -4,7 +4,7 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "settings.password"}} + {{.locale.Tr "settings.password"}}

    {{if or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2)}} @@ -13,43 +13,43 @@ {{.CsrfTokenHtml}} {{if .SignedUser.IsPasswordSet}}
    - +
    {{end}}
    - +
    - +
    - - {{.i18n.Tr "auth.forgot_password"}} + + {{.locale.Tr "auth.forgot_password"}}
    {{else}}
    -

    {{$.i18n.Tr "settings.password_change_disabled"}}

    +

    {{$.locale.Tr "settings.password_change_disabled"}}

    {{end}}

    - {{.i18n.Tr "settings.manage_emails"}} + {{.locale.Tr "settings.manage_emails"}}

    @@ -107,12 +107,12 @@
    {{.Email}} {{if .IsPrimary}} -
    {{$.i18n.Tr "settings.primary"}}
    +
    {{$.locale.Tr "settings.primary"}}
    {{end}} {{if .IsActivated}} -
    {{$.i18n.Tr "settings.activated"}}
    +
    {{$.locale.Tr "settings.activated"}}
    {{else}} -
    {{$.i18n.Tr "settings.requires_activation"}}
    +
    {{$.locale.Tr "settings.requires_activation"}}
    {{end}}
    @@ -123,37 +123,37 @@
    {{.CsrfTokenHtml}}
    - +

    - {{.i18n.Tr "settings.delete_account"}} + {{.locale.Tr "settings.delete_account"}}

    -

    {{svg "octicon-alert"}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}

    +

    {{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}

    {{ if .UserDeleteWithComments }} -

    {{.i18n.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}

    +

    {{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}

    {{ end }}
    {{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}}
    - +
    - {{.i18n.Tr "settings.confirm_delete_account"}} + {{.locale.Tr "settings.confirm_delete_account"}}
    - {{.i18n.Tr "auth.forgot_password"}} + {{.locale.Tr "auth.forgot_password"}}
    @@ -163,10 +163,10 @@ @@ -174,10 +174,10 @@ diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl index fe4a668dd5..233e682621 100644 --- a/templates/user/settings/appearance.tmpl +++ b/templates/user/settings/appearance.tmpl @@ -6,18 +6,18 @@

    - {{.i18n.Tr "settings.manage_themes"}} + {{.locale.Tr "settings.manage_themes"}}

    - +

    - {{.i18n.Tr "settings.hidden_comment_types"}} + {{.locale.Tr "settings.hidden_comment_types"}}

    @@ -79,90 +79,90 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index cfdfaeb1f8..c9f9fe8c25 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -4,26 +4,26 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "settings.manage_access_token"}} + {{.locale.Tr "settings.manage_access_token"}}

    - {{.i18n.Tr "settings.tokens_desc"}} + {{.locale.Tr "settings.tokens_desc"}}
    {{range .Tokens}}
    - +
    {{.Name}}
    - {{$.i18n.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{.UpdatedUnix.FormatShort}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} + {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{.UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}
    @@ -32,17 +32,17 @@
    - {{.i18n.Tr "settings.generate_new_token"}} + {{.locale.Tr "settings.generate_new_token"}}
    -

    {{.i18n.Tr "settings.new_token_desc"}}

    +

    {{.locale.Tr "settings.new_token_desc"}}

    {{.CsrfTokenHtml}}
    - +
    @@ -57,19 +57,19 @@ diff --git a/templates/user/settings/applications_oauth2.tmpl b/templates/user/settings/applications_oauth2.tmpl index 8218674bce..424060d2e0 100644 --- a/templates/user/settings/applications_oauth2.tmpl +++ b/templates/user/settings/applications_oauth2.tmpl @@ -1,23 +1,23 @@

    - {{.i18n.Tr "settings.manage_oauth2_applications"}} + {{.locale.Tr "settings.manage_oauth2_applications"}}

    - {{.i18n.Tr "settings.oauth2_application_create_description"}} + {{.locale.Tr "settings.oauth2_application_create_description"}}
    {{range $app := .Applications}}
    {{svg "octicon-pencil" 16 "mr-2"}} - {{$.i18n.Tr "settings.oauth2_application_edit"}} + {{$.locale.Tr "settings.oauth2_application_edit"}}
    @@ -29,20 +29,20 @@
    - {{.i18n.Tr "settings.create_oauth2_application" }} + {{.locale.Tr "settings.create_oauth2_application" }}
    {{.CsrfTokenHtml}}
    - +
    - +
    @@ -50,10 +50,10 @@ diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl index 1f8c7f756e..be3e78e46b 100644 --- a/templates/user/settings/applications_oauth2_edit.tmpl +++ b/templates/user/settings/applications_oauth2_edit.tmpl @@ -4,34 +4,34 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "settings.edit_oauth2_application"}} + {{.locale.Tr "settings.edit_oauth2_application"}}

    -

    {{.i18n.Tr "settings.oauth2_application_create_description"}}

    +

    {{.locale.Tr "settings.oauth2_application_create_description"}}

    {{.CsrfTokenHtml}}
    - +
    {{if .ClientSecret}}
    - +
    {{else}}
    - +
    {{end}}
    - {{.i18n.Tr "settings.oauth2_regenerate_secret_hint"}} + {{.locale.Tr "settings.oauth2_regenerate_secret_hint"}}
    {{.CsrfTokenHtml}} - {{.i18n.Tr "settings.oauth2_regenerate_secret"}} + {{.locale.Tr "settings.oauth2_regenerate_secret"}}
    @@ -39,15 +39,15 @@
    {{.CsrfTokenHtml}}
    - +
    - +
    @@ -57,10 +57,10 @@ diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl index 35a851ff36..40432c729b 100644 --- a/templates/user/settings/grants_oauth2.tmpl +++ b/templates/user/settings/grants_oauth2.tmpl @@ -1,10 +1,10 @@

    - {{.i18n.Tr "settings.authorized_oauth2_applications"}} + {{.locale.Tr "settings.authorized_oauth2_applications"}}

    - {{.i18n.Tr "settings.authorized_oauth2_applications_description"}} + {{.locale.Tr "settings.authorized_oauth2_applications_description"}}
    {{range $grant := .Grants}}
    @@ -12,7 +12,7 @@
    @@ -21,7 +21,7 @@
    {{$grant.Application.Name}}
    - {{$.i18n.Tr "settings.add_on"}} {{$grant.CreatedUnix.FormatShort}} + {{$.locale.Tr "settings.add_on"}} {{$grant.CreatedUnix.FormatShort}}
    @@ -32,10 +32,10 @@ diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 52fc0a5033..fbb0da5302 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -1,7 +1,7 @@

    - {{.i18n.Tr "settings.manage_gpg_keys"}} + {{.locale.Tr "settings.manage_gpg_keys"}}
    -
    {{.i18n.Tr "settings.add_key"}}
    +
    {{.locale.Tr "settings.add_key"}}

    @@ -10,47 +10,47 @@ {{.CsrfTokenHtml}}
    - - + +
    {{if .Err_Signature}}
    -

    {{.i18n.Tr "settings.gpg_token_required"}}

    +

    {{.locale.Tr "settings.gpg_token_required"}}

    -
    - - + +
    {{end}}
    - {{.i18n.Tr "settings.gpg_desc"}} + {{.locale.Tr "settings.gpg_desc"}}
    {{range .GPGKeys}}
    {{if and (not .Verified) (ne $.VerifyingID .KeyID)}} - {{$.i18n.Tr "settings.gpg_key_verify"}} + {{$.locale.Tr "settings.gpg_key_verify"}} {{end}}
    @@ -58,49 +58,49 @@
    {{if .Verified}} - {{svg "octicon-shield-check"}} {{$.i18n.Tr "settings.gpg_key_verified"}} + {{svg "octicon-shield-check"}} {{$.locale.Tr "settings.gpg_key_verified"}} {{end}} {{if gt (len .Emails) 0}} - {{svg "octicon-mail"}} {{$.i18n.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}{{.Email}} {{end}} + {{svg "octicon-mail"}} {{$.locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}{{.Email}} {{end}} {{end}}
    - {{$.i18n.Tr "settings.key_id"}}: {{.KeyID}} - {{$.i18n.Tr "settings.subkeys"}}: {{range .SubsKey}} {{.KeyID}} {{end}} + {{$.locale.Tr "settings.key_id"}}: {{.KeyID}} + {{$.locale.Tr "settings.subkeys"}}: {{range .SubsKey}} {{.KeyID}} {{end}}
    - {{$.i18n.Tr "settings.add_on"}} {{.AddedUnix.FormatShort}} + {{$.locale.Tr "settings.add_on"}} {{.AddedUnix.FormatShort}} - - {{if not .ExpiredUnix.IsZero}}{{$.i18n.Tr "settings.valid_until"}} {{.ExpiredUnix.FormatShort}}{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}} + {{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until"}} {{.ExpiredUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}
    {{if and (not .Verified) (eq $.VerifyingID .KeyID)}}
    -

    {{$.i18n.Tr "settings.gpg_token_required"}}

    +

    {{$.locale.Tr "settings.gpg_token_required"}}

    {{$.CsrfTokenHtml}}
    - +
    -

    {{$.i18n.Tr "settings.gpg_token_help"}}

    -

    {{$.i18n.Tr "settings.gpg_token_code" $.TokenToSign .KeyID}}

    +

    {{$.locale.Tr "settings.gpg_token_help"}}

    +

    {{$.locale.Tr "settings.gpg_token_code" $.TokenToSign .KeyID}}


    - - + +
    - {{$.i18n.Tr "settings.cancel"}} + {{$.locale.Tr "settings.cancel"}}
    @@ -109,15 +109,15 @@

    -

    {{.i18n.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}

    +

    {{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}

    diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 747b0c1712..a7fab1ea4f 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -1,31 +1,31 @@ {{if .AllowPrincipals}}

    - {{.i18n.Tr "settings.manage_ssh_principals"}} + {{.locale.Tr "settings.manage_ssh_principals"}}
    {{if not .DisableSSH}} -
    {{.i18n.Tr "settings.add_new_principal"}}
    +
    {{.locale.Tr "settings.add_new_principal"}}
    {{else}} -
    {{.i18n.Tr "settings.ssh_disabled"}}
    +
    {{.locale.Tr "settings.ssh_disabled"}}
    {{end}}

    - {{.i18n.Tr "settings.principal_desc"}} + {{.locale.Tr "settings.principal_desc"}}
    {{range .Principals}}
    - +
    {{.Name}}
    - {{$.i18n.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{.UpdatedUnix.FormatShort}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} + {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{.UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}
    @@ -36,19 +36,19 @@

    - {{.i18n.Tr "settings.add_new_principal"}} + {{.locale.Tr "settings.add_new_principal"}}

    {{.CsrfTokenHtml}}
    - +
    @@ -57,10 +57,10 @@ diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index ba62ac3cf4..46254c0dcb 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -1,12 +1,12 @@

    - {{.i18n.Tr "settings.manage_ssh_keys"}} + {{.locale.Tr "settings.manage_ssh_keys"}}
    {{if not .DisableSSH }}
    - {{.i18n.Tr "settings.add_key"}} + {{.locale.Tr "settings.add_key"}}
    {{else}} -
    {{.i18n.Tr "settings.ssh_disabled"}}
    +
    {{.locale.Tr "settings.ssh_disabled"}}
    {{end}}

    @@ -15,80 +15,80 @@
    {{.CsrfTokenHtml}}
    - +
    - - + +
    - {{.i18n.Tr "settings.ssh_desc"}} + {{.locale.Tr "settings.ssh_desc"}}
    {{range $index, $key := .Keys}}
    - {{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}} - {{$.i18n.Tr "settings.ssh_key_verify"}} + {{$.locale.Tr "settings.ssh_key_verify"}} {{end}}
    - {{svg "octicon-key" 32}} + {{svg "octicon-key" 32}}
    {{if .Verified}} - {{svg "octicon-shield-check"}} {{$.i18n.Tr "settings.ssh_key_verified"}} + {{svg "octicon-shield-check"}} {{$.locale.Tr "settings.ssh_key_verified"}} {{end}} {{.Name}}
    {{.Fingerprint}}
    - {{$.i18n.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{.UpdatedUnix.FormatShort}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} + {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{.UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}
    {{if and (not .Verified) (eq $.VerifyingFingerprint .Fingerprint)}}
    -

    {{$.i18n.Tr "settings.ssh_token_required"}}

    +

    {{$.locale.Tr "settings.ssh_token_required"}}

    {{$.CsrfTokenHtml}}
    - +
    -

    {{$.i18n.Tr "settings.ssh_token_help"}}

    +

    {{$.locale.Tr "settings.ssh_token_help"}}

    {{printf "echo -n '%s' | ssh-keygen -Y sign -n gitea -f /path_to_your_privkey" $.TokenToSign}}


    - - + +
    - {{$.i18n.Tr "settings.cancel"}} + {{$.locale.Tr "settings.cancel"}}
    @@ -97,15 +97,15 @@

    -

    {{.i18n.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}

    +

    {{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}

    diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 3477a5949b..01ae055d79 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -1,28 +1,28 @@
    - {{.i18n.Tr "settings.profile"}} + {{.locale.Tr "settings.profile"}} - {{.i18n.Tr "settings.account"}} + {{.locale.Tr "settings.account"}} - {{.i18n.Tr "settings.appearance"}} + {{.locale.Tr "settings.appearance"}} - {{.i18n.Tr "settings.security"}} + {{.locale.Tr "settings.security"}} - {{.i18n.Tr "settings.applications"}} + {{.locale.Tr "settings.applications"}} - {{.i18n.Tr "settings.ssh_gpg_keys"}} + {{.locale.Tr "settings.ssh_gpg_keys"}} - {{.i18n.Tr "settings.organization"}} + {{.locale.Tr "settings.organization"}} - {{.i18n.Tr "settings.repos"}} + {{.locale.Tr "settings.repos"}}
    diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index d951af2209..e25d5e7fa6 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -4,10 +4,10 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "settings.orgs"}} + {{.locale.Tr "settings.orgs"}} {{if .SignedUser.CanCreateOrganization}}
    - {{.i18n.Tr "admin.orgs.new_orga"}} + {{.locale.Tr "admin.orgs.new_orga"}}
    {{end}}

    @@ -19,7 +19,7 @@
    {{$.CsrfTokenHtml}} - +
    {{avatar . 28 "mini"}} @@ -31,7 +31,7 @@
    {{template "base/paginate" .}} {{else}} - {{.i18n.Tr "settings.orgs_none"}} + {{.locale.Tr "settings.orgs_none"}} {{end}}
    diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 9429db1ad6..87b6e37ed5 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -4,46 +4,46 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "settings.public_profile"}} + {{.locale.Tr "settings.public_profile"}}

    -

    {{.i18n.Tr "settings.profile_desc"}}

    +

    {{.locale.Tr "settings.profile_desc"}}

    {{.CsrfTokenHtml}}
    -
    - +
    - +

    {{.SignedUser.Email}}

    - +
    - - + +
    - +
    - +
    @@ -51,29 +51,29 @@
    - +
    - +
    {{if .SignedUser.Visibility.IsPublic}}{{end}} {{if .SignedUser.Visibility.IsLimited}}{{end}} {{if .SignedUser.Visibility.IsPrivate}}{{end}}
    - {{if .SignedUser.Visibility.IsPublic}}{{.i18n.Tr "settings.visibility.public"}}{{end}} - {{if .SignedUser.Visibility.IsLimited}}{{.i18n.Tr "settings.visibility.limited"}}{{end}} - {{if .SignedUser.Visibility.IsPrivate}}{{.i18n.Tr "settings.visibility.private"}}{{end}} + {{if .SignedUser.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} + {{if .SignedUser.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} + {{if .SignedUser.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
    {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    {{range $mode := .AllowedUserVisibilityModes}} {{if $mode.IsPublic}} -
    {{$.i18n.Tr "settings.visibility.public"}}
    +
    {{$.locale.Tr "settings.visibility.public"}}
    {{else if $mode.IsLimited}} -
    {{$.i18n.Tr "settings.visibility.limited"}}
    +
    {{$.locale.Tr "settings.visibility.limited"}}
    {{else if $mode.IsPrivate}} -
    {{$.i18n.Tr "settings.visibility.private"}}
    +
    {{$.locale.Tr "settings.visibility.private"}}
    {{end}} {{end}}
    @@ -82,7 +82,7 @@
    - +
    @@ -90,13 +90,13 @@
    - +

    - {{.i18n.Tr "settings.avatar"}} + {{.locale.Tr "settings.avatar"}}

    @@ -105,11 +105,11 @@
    - +
    - +
    {{end}} @@ -117,18 +117,18 @@
    - +
    - +
    - - {{$.i18n.Tr "settings.delete_current_avatar"}} + + {{$.locale.Tr "settings.delete_current_avatar"}}
    diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 31f4ca6a17..eba0d22d5e 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -4,7 +4,7 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "settings.repos"}} + {{.locale.Tr "settings.repos"}}

    {{if or .allowAdopt .allowDelete}} @@ -29,7 +29,7 @@ {{$repo.OwnerName}}/{{$repo.Name}} {{FileSize $repo.Size}} {{if $repo.IsFork}} - {{$.i18n.Tr "repo.forked_from"}} + {{$.locale.Tr "repo.forked_from"}} {{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}} {{end}} {{else}} @@ -37,14 +37,14 @@ {{$.Owner.Name}}/{{$dir}}
    {{if $.allowAdopt}} - + {{end}} {{if $.allowDelete}} - + @@ -132,7 +132,7 @@ {{template "base/paginate" .}} {{else}}
    - {{.i18n.Tr "settings.repos_none"}} + {{.locale.Tr "settings.repos_none"}}
    {{end}} {{end}} @@ -143,10 +143,10 @@
    {{svg "octicon-trash"}} - {{.i18n.Tr "settings.remove_account_link"}} + {{.locale.Tr "settings.remove_account_link"}}
    -

    {{.i18n.Tr "settings.remove_account_link_desc"}}

    +

    {{.locale.Tr "settings.remove_account_link_desc"}}

    {{template "base/delete_modal_actions" .}}
    diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl index da9afb7956..b726245724 100644 --- a/templates/user/settings/security/accountlinks.tmpl +++ b/templates/user/settings/security/accountlinks.tmpl @@ -1,9 +1,9 @@

    - {{.i18n.Tr "settings.manage_account_links"}} + {{.locale.Tr "settings.manage_account_links"}} {{if .OrderedOAuth2Names}}
    -
    {{.i18n.Tr "settings.link_account"}}
    +
    {{.locale.Tr "settings.link_account"}}
    {{range $key := .OrderedOAuth2Names}} {{$provider := index $.OAuth2Providers $key}} @@ -21,19 +21,19 @@
    - {{.i18n.Tr "settings.manage_account_links_desc"}} + {{.locale.Tr "settings.manage_account_links_desc"}}
    {{if .AccountLinks}} {{range $loginSource, $provider := .AccountLinks}}
    {{$provider}} - {{if $loginSource.IsActive}}{{$.i18n.Tr "settings.active"}}{{end}} + {{if $loginSource.IsActive}}{{$.locale.Tr "settings.active"}}{{end}}
    {{end}} @@ -44,10 +44,10 @@ diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index 2a167a712b..5d6c9cf8cd 100644 --- a/templates/user/settings/security/openid.tmpl +++ b/templates/user/settings/security/openid.tmpl @@ -1,16 +1,16 @@

    - {{.i18n.Tr "settings.manage_openid"}} + {{.locale.Tr "settings.manage_openid"}}

    - {{.i18n.Tr "settings.openid_desc"}} + {{.locale.Tr "settings.openid_desc"}}
    {{range .OpenIDs}}
    @@ -20,12 +20,12 @@ {{if .Show}} {{else}} {{end}} @@ -42,11 +42,11 @@
    {{.CsrfTokenHtml}}
    - +
    @@ -54,10 +54,10 @@ diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl index 7b0f2d473e..3d2f78ed0d 100644 --- a/templates/user/settings/security/twofa.tmpl +++ b/templates/user/settings/security/twofa.tmpl @@ -1,24 +1,24 @@

    - {{.i18n.Tr "settings.twofa"}} + {{.locale.Tr "settings.twofa"}}

    -

    {{.i18n.Tr "settings.twofa_desc"}}

    +

    {{.locale.Tr "settings.twofa_desc"}}

    {{if .TOTPEnrolled}} -

    {{$.i18n.Tr "settings.twofa_is_enrolled" | Str2html }}

    +

    {{$.locale.Tr "settings.twofa_is_enrolled" | Str2html }}

    {{.CsrfTokenHtml}} -

    {{.i18n.Tr "settings.regenerate_scratch_token_desc"}}

    - +

    {{.locale.Tr "settings.regenerate_scratch_token_desc"}}

    +
    {{.CsrfTokenHtml}} -

    {{.i18n.Tr "settings.twofa_disable_note"}}

    -
    {{$.i18n.Tr "settings.twofa_disable"}}
    +

    {{.locale.Tr "settings.twofa_disable_note"}}

    +
    {{$.locale.Tr "settings.twofa_disable"}}
    {{else}} -

    {{.i18n.Tr "settings.twofa_not_enrolled"}}

    +

    {{.locale.Tr "settings.twofa_not_enrolled"}}

    - {{$.i18n.Tr "settings.twofa_enroll"}} + {{$.locale.Tr "settings.twofa_enroll"}}
    {{end}}
    @@ -26,10 +26,10 @@ diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl index c8ed0b7761..0eb543f747 100644 --- a/templates/user/settings/security/twofa_enroll.tmpl +++ b/templates/user/settings/security/twofa_enroll.tmpl @@ -4,22 +4,22 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "settings.twofa_enroll"}} + {{.locale.Tr "settings.twofa_enroll"}}

    -

    {{.i18n.Tr "settings.scan_this_image"}}

    +

    {{.locale.Tr "settings.scan_this_image"}}

    {{.TwofaSecret}} -

    {{.i18n.Tr "settings.or_enter_secret" .TwofaSecret}} -

    {{.i18n.Tr "settings.then_enter_passcode"}} +

    {{.locale.Tr "settings.or_enter_secret" .TwofaSecret}} +

    {{.locale.Tr "settings.then_enter_passcode"}}
    {{.CsrfTokenHtml}}

    - +
    - +
    diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index 733b3066c5..2fea2843f6 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -1,30 +1,30 @@

    -{{.i18n.Tr "settings.webauthn"}} +{{.locale.Tr "settings.webauthn"}}

    -

    {{.i18n.Tr "settings.webauthn_desc" | Str2html}}

    +

    {{.locale.Tr "settings.webauthn_desc" | Str2html}}

    {{range .WebAuthnCredentials}}
    {{.Name}}
    - {{TimeSinceUnix .CreatedUnix $.i18n}} + {{TimeSinceUnix .CreatedUnix $.locale}}
    {{end}}
    {{.CsrfTokenHtml}}
    - +
    - +
    @@ -33,10 +33,10 @@