Fix i18n for Link Account button, re-format tmpl (#19835)

tokarchuk/v1.17
wxiaoguang 3 years ago committed by GitHub
parent 76681883ec
commit e0273bad72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      options/locale/locale_en-US.ini
  2. 27
      templates/user/settings/security/accountlinks.tmpl

@ -778,6 +778,7 @@ webauthn_delete_key_desc = If you remove a security key you can no longer sign i
manage_account_links = Manage Linked Accounts manage_account_links = Manage Linked Accounts
manage_account_links_desc = These external accounts are linked to your Gitea account. manage_account_links_desc = These external accounts are linked to your Gitea account.
account_links_not_available = There are currently no external accounts linked to your Gitea account. account_links_not_available = There are currently no external accounts linked to your Gitea account.
link_account = Link Account
remove_account_link = Remove Linked Account remove_account_link = Remove Linked Account
remove_account_link_desc = Removing a linked account will revoke its access to your Gitea account. Continue? remove_account_link_desc = Removing a linked account will revoke its access to your Gitea account. Continue?
remove_account_link_success = The linked account has been removed. remove_account_link_success = The linked account has been removed.

@ -3,15 +3,13 @@
{{if .OrderedOAuth2Names}} {{if .OrderedOAuth2Names}}
<div class="ui right"> <div class="ui right">
<div class="ui dropdown"> <div class="ui dropdown">
<div class="ui primary tiny button">Link Account</div> <div class="ui primary tiny button">{{.i18n.Tr "settings.link_account"}}</div>
<div class="menu"> <div class="menu">
{{range $key := .OrderedOAuth2Names}} {{range $key := .OrderedOAuth2Names}}
{{$provider := index $.OAuth2Providers $key}} {{$provider := index $.OAuth2Providers $key}}
<a class="item" href="{{AppSubUrl}}/user/oauth2/{{$key}}"> <a class="item" href="{{AppSubUrl}}/user/oauth2/{{$key}}">
<img <img width="20" height="20" src="{{AppSubUrl}}{{$provider.Image}}" alt="{{$provider.DisplayName}}">
alt="{{$provider.DisplayName}}" {{$provider.DisplayName}}
src="{{AppSubUrl}}{{$provider.Image}}"
width="20" height="20">{{$provider.DisplayName}}
</a> </a>
{{end}} {{end}}
</div> </div>
@ -19,25 +17,26 @@
</div> </div>
{{end}} {{end}}
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
<div class="ui key list"> <div class="ui key list">
<div class="item"> <div class="item">
{{.i18n.Tr "settings.manage_account_links_desc"}} {{.i18n.Tr "settings.manage_account_links_desc"}}
</div> </div>
{{if .AccountLinks}} {{if .AccountLinks}}
{{range $loginSource, $provider := .AccountLinks}} {{range $loginSource, $provider := .AccountLinks}}
<div class="item"> <div class="item">
<div class="right floated content"> <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}}"> <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"}} {{$.i18n.Tr "settings.delete_key"}}
</button> </button>
</div> </div>
<div class="content"> <div class="content">
<strong>{{$provider}}</strong> <strong>{{$provider}}</strong>
{{if $loginSource.IsActive}}<span class="text red">{{$.i18n.Tr "settings.active"}}</span>{{end}} {{if $loginSource.IsActive}}<span class="text red">{{$.i18n.Tr "settings.active"}}</span>{{end}}
</div> </div>
</div> </div>
{{end}} {{end}}
{{end}} {{end}}
</div> </div>
</div> </div>

Loading…
Cancel
Save