diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2024-03-14 00:24:34 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-13 16:24:34 +0000 |
commit | df60dbfb9918081962614d063485337fb42e0ee7 (patch) | |
tree | 34cc7a230606cb359bb4cd10549020c2e568bc71 | |
parent | e01b0014de5b732181ac42c03a77c21219f88c6a (diff) | |
download | gitea-df60dbfb9918081962614d063485337fb42e0ee7.tar.gz gitea-df60dbfb9918081962614d063485337fb42e0ee7.zip |
Fix incorrect locale Tr for gpg command (#29754)
-rw-r--r-- | options/locale/locale_en-US.ini | 1 | ||||
-rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index afd613af59..836703a480 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -804,7 +804,6 @@ gpg_invalid_token_signature = The provided GPG key, signature and token do not m gpg_token_required = You must provide a signature for the below token gpg_token = Token gpg_token_help = You can generate a signature using: -gpg_token_code = echo "%s" | gpg -a --default-key %s --detach-sig gpg_token_signature = Armored GPG signature key_signature_gpg_placeholder = Begins with '-----BEGIN PGP SIGNATURE-----' verify_gpg_key_success = GPG key "%s" has been verified. diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 0dd0059511..e57658b197 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -22,7 +22,7 @@ <input readonly="" value="{{.TokenToSign}}"> <div class="help"> <p>{{ctx.Locale.Tr "settings.gpg_token_help"}}</p> - <p><code>{{ctx.Locale.Tr "settings.gpg_token_code" .TokenToSign .PaddedKeyID}}</code></p> + <p><code>{{printf `echo "%s" | gpg -a --default-key %s --detach-sig` .TokenToSign .PaddedKeyID}}</code></p> </div> </div> <div class="field"> @@ -90,7 +90,7 @@ <input readonly="" value="{{$.TokenToSign}}"> <div class="help"> <p>{{ctx.Locale.Tr "settings.gpg_token_help"}}</p> - <p><code>{{ctx.Locale.Tr "settings.gpg_token_code" $.TokenToSign .PaddedKeyID}}</code></p> + <p><code>{{printf `echo "%s" | gpg -a --default-key %s --detach-sig` $.TokenToSign .PaddedKeyID}}</code></p> </div> <br> </div> |