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

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 5061c735ae0cd5313ea2063c28e5069256c0e223..66dad56fd08fa7df99dd49802814c48466392d43 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -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_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.
+link_account = Link 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_success = The linked account has been removed.

diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl
index cdbd8ad1de791a3799484fc732f5b7e03e4ae85d..da9afb79569828df577a5f269251d8829385c57b 100644 (file)
--- a/templates/user/settings/security/accountlinks.tmpl
+++ b/templates/user/settings/security/accountlinks.tmpl
@@ -3,15 +3,13 @@
        {{if .OrderedOAuth2Names}}
                <div class="ui right">
                        <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">
                                        {{range $key := .OrderedOAuth2Names}}
                                                {{$provider := index $.OAuth2Providers $key}}
                                                <a class="item" href="{{AppSubUrl}}/user/oauth2/{{$key}}">
-                                                       <img
-                                                               alt="{{$provider.DisplayName}}"
-                                                               src="{{AppSubUrl}}{{$provider.Image}}"
-                                                               width="20" height="20">{{$provider.DisplayName}}
+                                                       <img width="20" height="20" src="{{AppSubUrl}}{{$provider.Image}}" alt="{{$provider.DisplayName}}">
+                                                       {{$provider.DisplayName}}
                                                </a>
                                        {{end}}
                                </div>
@@ -19,25 +17,26 @@
                </div>
        {{end}}
 </h4>
+
 <div class="ui attached segment">
        <div class="ui key list">
                <div class="item">
                        {{.i18n.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"}}
-                                               </button>
-                               </div>
+                       {{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"}}
+                                                       </button>
+                                       </div>
                                        <div class="content">
                                                <strong>{{$provider}}</strong>
                                                {{if $loginSource.IsActive}}<span class="text red">{{$.i18n.Tr "settings.active"}}</span>{{end}}
                                        </div>
-                       </div>
-               {{end}}
+                               </div>
+                       {{end}}
                {{end}}
        </div>
 </div>