domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Refactor i18n to locale (#20153)

Browse source 
* 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
This commit is contained in:
Gusted 2022-06-27 22:58:46 +02:00 • committed by GitHub
parent b551bc2a08
commit d55a0b7238
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
285 changed files with 3668 additions and 3668 deletions
Download patch file Download diff file Expand all files Collapse all files

14
templates/user/settings/security/accountlinks.tmpl
View file

@ -1,9 +1,9 @@
<h4 class="ui top attached header">
{{.i18n.Tr "settings.manage_account_links"}}
{{.locale.Tr "settings.manage_account_links"}}
{{if .OrderedOAuth2Names}}
<div class="ui right">
<div class="ui dropdown">
<div class="ui primary tiny button">{{.i18n.Tr "settings.link_account"}}</div>
<div class="ui primary tiny button">{{.locale.Tr "settings.link_account"}}</div>
<div class="menu">
{{range $key := .OrderedOAuth2Names}}
{{$provider := index $.OAuth2Providers $key}}
@ -21,19 +21,19 @@
<div class="ui attached segment">
<div class="ui key list">
<div class="item">
{{.i18n.Tr "settings.manage_account_links_desc"}}
{{.locale.Tr "settings.manage_account_links_desc"}}
</div>
{{if .AccountLinks}}
{{range $loginSource, $provider := .AccountLinks}}
<div class="item">
<div class="right floated content">
<button class="ui red tiny button delete-button" data-modal-id="delete-account-link" data-url="{{AppSubUrl}}/user/settings/security/account_link" data-id="{{$loginSource.ID}}">
{{$.i18n.Tr "settings.delete_key"}}
{{$.locale.Tr "settings.delete_key"}}
</button>
</div>
<div class="content">
<strong>{{$provider}}</strong>
{{if $loginSource.IsActive}}<span class="text red">{{$.i18n.Tr "settings.active"}}</span>{{end}}
{{if $loginSource.IsActive}}<span class="text red">{{$.locale.Tr "settings.active"}}</span>{{end}}
</div>
</div>
{{end}}
@ -44,10 +44,10 @@
<div class="ui small basic delete modal" id="delete-account-link">
<div class="ui icon header">
{{svg "octicon-trash"}}
{{.i18n.Tr "settings.remove_account_link"}}
{{.locale.Tr "settings.remove_account_link"}}
</div>
<div class="content">
<p>{{.i18n.Tr "settings.remove_account_link_desc"}}</p>
<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
</div>
{{template "base/delete_modal_actions" .}}
</div>

18
templates/user/settings/security/openid.tmpl
View file

@ -1,16 +1,16 @@
<h4 class="ui top attached header">
{{.i18n.Tr "settings.manage_openid"}}
{{.locale.Tr "settings.manage_openid"}}
</h4>
<div class="ui attached segment">
<div class="ui openid list">
<div class="item">
{{.i18n.Tr "settings.openid_desc"}}
{{.locale.Tr "settings.openid_desc"}}
</div>
{{range .OpenIDs}}
<div class="item">
<div class="right floated content">
<button class="ui red tiny button delete-button" data-modal-id="delete-openid" data-url="{{AppSubUrl}}/user/settings/security/openid/delete" data-id="{{.ID}}">
{{$.i18n.Tr "settings.delete_key"}}
{{$.locale.Tr "settings.delete_key"}}
</button>
</div>
<div class="right floated content">
@ -20,12 +20,12 @@
{{if .Show}}
<button class="ui tiny button">
{{svg "octicon-eye" 16 "icon"}}
{{$.i18n.Tr "settings.hide_openid"}}
{{$.locale.Tr "settings.hide_openid"}}
</button>
{{else}}
<button class="ui tiny button">
{{svg "octicon-eye-closed" 16 "icon"}}
{{$.i18n.Tr "settings.show_openid"}}
{{$.locale.Tr "settings.show_openid"}}
</button>
{{end}}
</button>
@ -42,11 +42,11 @@
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/openid" method="post">
{{.CsrfTokenHtml}}
<div class="required field {{if .Err_OpenID}}error{{end}}">
<label for="openid">{{.i18n.Tr "settings.add_new_openid"}}</label>
<label for="openid">{{.locale.Tr "settings.add_new_openid"}}</label>
<input id="openid" name="openid" type="text" required>
</div>
<button class="ui green button">
{{.i18n.Tr "settings.add_openid"}}
{{.locale.Tr "settings.add_openid"}}
</button>
</form>
</div>
@ -54,10 +54,10 @@
<div class="ui small basic delete modal" id="delete-openid">
<div class="ui icon header">
{{svg "octicon-trash"}}
{{.i18n.Tr "settings.openid_deletion"}}
{{.locale.Tr "settings.openid_deletion"}}
</div>
<div class="content">
<p>{{.i18n.Tr "settings.openid_deletion_desc"}}</p>
<p>{{.locale.Tr "settings.openid_deletion_desc"}}</p>
</div>
{{template "base/delete_modal_actions" .}}
</div>

22
templates/user/settings/security/twofa.tmpl
View file

@ -1,24 +1,24 @@
<h4 class="ui top attached header">
{{.i18n.Tr "settings.twofa"}}
{{.locale.Tr "settings.twofa"}}
</h4>
<div class="ui attached segment">
<p>{{.i18n.Tr "settings.twofa_desc"}}</p>
<p>{{.locale.Tr "settings.twofa_desc"}}</p>
{{if .TOTPEnrolled}}
<p>{{$.i18n.Tr "settings.twofa_is_enrolled" | Str2html }}</p>
<p>{{$.locale.Tr "settings.twofa_is_enrolled" | Str2html }}</p>
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/regenerate_scratch" method="post" enctype="multipart/form-data">
{{.CsrfTokenHtml}}
<p>{{.i18n.Tr "settings.regenerate_scratch_token_desc"}}</p>
<button class="ui primary button">{{$.i18n.Tr "settings.twofa_scratch_token_regenerate"}}</button>
<p>{{.locale.Tr "settings.regenerate_scratch_token_desc"}}</p>
<button class="ui primary button">{{$.locale.Tr "settings.twofa_scratch_token_regenerate"}}</button>
</form>
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form">
{{.CsrfTokenHtml}}
<p>{{.i18n.Tr "settings.twofa_disable_note"}}</p>
<div class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{$.i18n.Tr "settings.twofa_disable"}}</div>
<p>{{.locale.Tr "settings.twofa_disable_note"}}</p>
<div class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{$.locale.Tr "settings.twofa_disable"}}</div>
</form>
{{else}}
<p>{{.i18n.Tr "settings.twofa_not_enrolled"}}</p>
<p>{{.locale.Tr "settings.twofa_not_enrolled"}}</p>
<div class="inline field">
<a class="ui green button" href="{{AppSubUrl}}/user/settings/security/two_factor/enroll">{{$.i18n.Tr "settings.twofa_enroll"}}</a>
<a class="ui green button" href="{{AppSubUrl}}/user/settings/security/two_factor/enroll">{{$.locale.Tr "settings.twofa_enroll"}}</a>
</div>
{{end}}
</div>
@ -26,10 +26,10 @@
<div class="ui small basic delete modal" id="disable-twofa">
<div class="ui icon header">
{{svg "octicon-trash"}}
{{.i18n.Tr "settings.twofa_disable"}}
{{.locale.Tr "settings.twofa_disable"}}
</div>
<div class="content">
<p>{{.i18n.Tr "settings.twofa_disable_desc"}}</p>
<p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
</div>
{{template "base/delete_modal_actions" .}}
</div>

12
templates/user/settings/security/twofa_enroll.tmpl
View file

@ -4,22 +4,22 @@
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.twofa_enroll"}}
{{.locale.Tr "settings.twofa_enroll"}}
</h4>
<div class="ui attached segment">
<p>{{.i18n.Tr "settings.scan_this_image"}}</p>
<p>{{.locale.Tr "settings.scan_this_image"}}</p>
<img src="{{.QrUri}}" alt="{{.TwofaSecret}}">
<p>{{.i18n.Tr "settings.or_enter_secret" .TwofaSecret}}
<p>{{.i18n.Tr "settings.then_enter_passcode"}}
<p>{{.locale.Tr "settings.or_enter_secret" .TwofaSecret}}
<p>{{.locale.Tr "settings.then_enter_passcode"}}
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<div class="inline required field {{if .Err_Passcode}}error{{end}}">
<label for="passcode">{{.i18n.Tr "passcode"}}</label>
<label for="passcode">{{.locale.Tr "passcode"}}</label>
<input id="passcode" name="passcode" autofocus required>
</div>
<div class="inline field">
<label></label>
<button class="ui green button">{{.i18n.Tr "auth.verify"}}</button>
<button class="ui green button">{{.locale.Tr "auth.verify"}}</button>
</div>
</form>
</div>

16
templates/user/settings/security/webauthn.tmpl
View file

@ -1,30 +1,30 @@
<h4 class="ui top attached header">
{{.i18n.Tr "settings.webauthn"}}
{{.locale.Tr "settings.webauthn"}}
</h4>
<div class="ui attached segment">
<p>{{.i18n.Tr "settings.webauthn_desc" | Str2html}}</p>
<p>{{.locale.Tr "settings.webauthn_desc" | Str2html}}</p>
<div class="ui key list">
{{range .WebAuthnCredentials}}
<div class="item">
<div class="right floated content">
<button class="ui red tiny button delete-button" data-modal-id="delete-registration" data-url="{{$.Link}}/webauthn/delete" data-id="{{.ID}}">
{{$.i18n.Tr "settings.delete_key"}}
{{$.locale.Tr "settings.delete_key"}}
</button>
</div>
<div class="content">
<strong>{{.Name}}</strong>
</div>
<span class="time">{{TimeSinceUnix .CreatedUnix $.i18n}}</span>
<span class="time">{{TimeSinceUnix .CreatedUnix $.locale}}</span>
</div>
{{end}}
</div>
<div class="ui form">
{{.CsrfTokenHtml}}
<div class="required field">
<label for="nickname">{{.i18n.Tr "settings.webauthn_nickname"}}</label>
<label for="nickname">{{.locale.Tr "settings.webauthn_nickname"}}</label>
<input id="nickname" name="nickname" type="text" required>
</div>
<button id="register-webauthn" class="ui green button">{{svg "octicon-key"}} {{.i18n.Tr "settings.webauthn_register_key"}}</button>
<button id="register-webauthn" class="ui green button">{{svg "octicon-key"}} {{.locale.Tr "settings.webauthn_register_key"}}</button>
</div>
</div>
@ -33,10 +33,10 @@
<div class="ui small basic delete modal" id="delete-registration">
<div class="ui icon header">
{{svg "octicon-trash"}}
{{.i18n.Tr "settings.webauthn_delete_key"}}
{{.locale.Tr "settings.webauthn_delete_key"}}
</div>
<div class="content">
<p>{{.i18n.Tr "settings.webauthn_delete_key_desc"}}</p>
<p>{{.locale.Tr "settings.webauthn_delete_key_desc"}}</p>
</div>
{{template "base/delete_modal_actions" .}}
</div>