diff options
author | Gusted <williamzijl7@hotmail.com> | 2022-06-27 22:58:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-27 15:58:46 -0500 |
commit | d55a0b723809f5b94acd948b924c8518014445e0 (patch) | |
tree | 0ef9ea54f30769ca1d16ce20e551bd7a078f7f5e /templates/org/settings | |
parent | b551bc2a089d3310dde5706d1b9702f112fe3ea0 (diff) | |
download | gitea-d55a0b723809f5b94acd948b924c8518014445e0.tar.gz gitea-d55a0b723809f5b94acd948b924c8518014445e0.zip |
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
Diffstat (limited to 'templates/org/settings')
-rw-r--r-- | templates/org/settings/delete.tmpl | 12 | ||||
-rw-r--r-- | templates/org/settings/hook_new.tmpl | 2 | ||||
-rw-r--r-- | templates/org/settings/labels.tmpl | 4 | ||||
-rw-r--r-- | templates/org/settings/navbar.tmpl | 10 | ||||
-rw-r--r-- | templates/org/settings/options.tmpl | 40 |
5 files changed, 34 insertions, 34 deletions
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 1cf24639df..8a38dcafe3 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -7,20 +7,20 @@ <div class="twelve wide column content"> {{template "base/alert" .}} <h4 class="ui top attached error header"> - {{.i18n.Tr "org.settings.delete_account"}} + {{.locale.Tr "org.settings.delete_account"}} </h4> <div class="ui attached error segment"> <div class="ui red message"> - <p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p> + <p class="text left">{{svg "octicon-alert"}} {{.locale.Tr "org.settings.delete_prompt" | Str2html}}</p> </div> <form class="ui form ignore-dirty" id="delete-form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} <div class="inline required field {{if .Err_OrgName}}error{{end}}"> - <label for="org_name">{{.i18n.Tr "org.org_name_holder"}}</label> + <label for="org_name">{{.locale.Tr "org.org_name_holder"}}</label> <input id="org_name" name="org_name" value="" autocomplete="off" autofocus required> </div> <div class="ui red button delete-button" data-type="form" data-form="#delete-form"> - {{.i18n.Tr "org.settings.confirm_delete_account"}} + {{.locale.Tr "org.settings.confirm_delete_account"}} </div> </form> </div> @@ -32,10 +32,10 @@ <div class="ui small basic delete modal"> <div class="ui icon header"> {{svg "octicon-trash"}} - {{.i18n.Tr "org.settings.delete_org_title"}} + {{.locale.Tr "org.settings.delete_org_title"}} </div> <div class="content"> - <p>{{.i18n.Tr "org.settings.delete_org_desc"}}</p> + <p>{{.locale.Tr "org.settings.delete_org_desc"}}</p> </div> {{template "base/delete_modal_actions" .}} </div> diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index 5e8ebb51e9..7308cafa20 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -7,7 +7,7 @@ <div class="twelve wide column content"> {{template "base/alert" .}} <h4 class="ui top attached header"> - {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} + {{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}} <div class="ui right"> {{if eq .HookType "gitea"}} <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg"> diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 482d1b17d0..a6b5405a42 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -7,11 +7,11 @@ <div class="ui twelve wide column content"> <div class="ui grid"> <div class="left floated twelve wide column"> - {{$.i18n.Tr "org.settings.labels_desc" | Str2html}} + {{$.locale.Tr "org.settings.labels_desc" | Str2html}} </div> <div class="right floated three wide column"> <div class="ui right"> - <div class="ui green new-label button">{{.i18n.Tr "repo.issues.new_label"}}</div> + <div class="ui green new-label button">{{.locale.Tr "repo.issues.new_label"}}</div> </div> </div> </div> diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index b70e6b1d09..0c8423cd75 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -1,19 +1,19 @@ <div class="four wide column"> <div class="ui fluid vertical menu"> - <div class="header item">{{.i18n.Tr "org.settings"}}</div> + <div class="header item">{{.locale.Tr "org.settings"}}</div> <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.OrgLink}}/settings"> - {{.i18n.Tr "org.settings.options"}} + {{.locale.Tr "org.settings.options"}} </a> {{if not DisableWebhooks}} <a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.OrgLink}}/settings/hooks"> - {{.i18n.Tr "repo.settings.hooks"}} + {{.locale.Tr "repo.settings.hooks"}} </a> {{end}} <a class="{{if .PageIsOrgSettingsLabels}}active{{end}} item" href="{{.OrgLink}}/settings/labels"> - {{.i18n.Tr "repo.labels"}} + {{.locale.Tr "repo.labels"}} </a> <a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{.OrgLink}}/settings/delete"> - {{.i18n.Tr "org.settings.delete"}} + {{.locale.Tr "org.settings.delete"}} </a> </div> </div> diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 09bf5e0caa..1b12c1221b 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -7,64 +7,64 @@ <div class="twelve wide column content"> {{template "base/alert" .}} <h4 class="ui top attached header"> - {{.i18n.Tr "org.settings.options"}} + {{.locale.Tr "org.settings.options"}} </h4> <div class="ui attached segment"> <form class="ui form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} <div class="required field {{if .Err_Name}}error{{end}}"> - <label for="org_name">{{.i18n.Tr "org.org_name_holder"}} - <span class="text red hide" id="org-name-change-prompt"> {{.i18n.Tr "org.settings.change_orgname_prompt"}}</span> - <span class="text red hide" id="org-name-change-redirect-prompt"> {{.i18n.Tr "org.settings.change_orgname_redirect_prompt"}}</span> + <label for="org_name">{{.locale.Tr "org.org_name_holder"}} + <span class="text red hide" id="org-name-change-prompt"> {{.locale.Tr "org.settings.change_orgname_prompt"}}</span> + <span class="text red hide" id="org-name-change-redirect-prompt"> {{.locale.Tr "org.settings.change_orgname_redirect_prompt"}}</span> </label> <input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required> </div> <div class="field {{if .Err_FullName}}error{{end}}"> - <label for="full_name">{{.i18n.Tr "org.org_full_name_holder"}}</label> + <label for="full_name">{{.locale.Tr "org.org_full_name_holder"}}</label> <input id="full_name" name="full_name" value="{{.Org.FullName}}"> </div> <div class="field {{if .Err_Description}}error{{end}}"> - <label for="description">{{$.i18n.Tr "org.org_desc"}}</label> + <label for="description">{{$.locale.Tr "org.org_desc"}}</label> <textarea id="description" name="description" rows="2">{{.Org.Description}}</textarea> </div> <div class="field {{if .Err_Website}}error{{end}}"> - <label for="website">{{.i18n.Tr "org.settings.website"}}</label> + <label for="website">{{.locale.Tr "org.settings.website"}}</label> <input id="website" name="website" type="url" value="{{.Org.Website}}"> </div> <div class="field"> - <label for="location">{{.i18n.Tr "org.settings.location"}}</label> + <label for="location">{{.locale.Tr "org.settings.location"}}</label> <input id="location" name="location" value="{{.Org.Location}}"> </div> <div class="ui divider"></div> <div class="field" id="visibility_box"> - <label for="visibility">{{.i18n.Tr "org.settings.visibility"}}</label> + <label for="visibility">{{.locale.Tr "org.settings.visibility"}}</label> <div class="field"> <div class="ui radio checkbox"> <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}/> - <label>{{.i18n.Tr "org.settings.visibility.public"}}</label> + <label>{{.locale.Tr "org.settings.visibility.public"}}</label> </div> </div> <div class="field"> <div class="ui radio checkbox"> <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}/> - <label>{{.i18n.Tr "org.settings.visibility.limited"}}</label> + <label>{{.locale.Tr "org.settings.visibility.limited"}}</label> </div> </div> <div class="field"> <div class="ui radio checkbox"> <input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}/> - <label>{{.i18n.Tr "org.settings.visibility.private"}}</label> + <label>{{.locale.Tr "org.settings.visibility.private"}}</label> </div> </div> </div> <div class="field" id="permission_box"> - <label>{{.i18n.Tr "org.settings.permission"}}</label> + <label>{{.locale.Tr "org.settings.permission"}}</label> <div class="field"> <div class="ui checkbox"> <input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if .RepoAdminChangeTeamAccess}}checked{{end}}/> - <label>{{.i18n.Tr "org.settings.repoadminchangeteam"}}</label> + <label>{{.locale.Tr "org.settings.repoadminchangeteam"}}</label> </div> </div> </div> @@ -73,14 +73,14 @@ <div class="ui divider"></div> <div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}"> - <label for="max_repo_creation">{{.i18n.Tr "admin.users.max_repo_creation"}}</label> + <label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label> <input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.Org.MaxRepoCreation}}"> - <p class="help">{{.i18n.Tr "admin.users.max_repo_creation_desc"}}</p> + <p class="help">{{.locale.Tr "admin.users.max_repo_creation_desc"}}</p> </div> {{end}} <div class="field"> - <button class="ui green button">{{$.i18n.Tr "org.settings.update_settings"}}</button> + <button class="ui green button">{{$.locale.Tr "org.settings.update_settings"}}</button> </div> </form> @@ -89,13 +89,13 @@ <form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data"> {{.CsrfTokenHtml}} <div class="inline field"> - <label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label> + <label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label> <input name="avatar" type="file" > </div> <div class="field"> - <button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button> - <a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a> + <button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button> + <a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a> </div> </form> </div> |