Skip to content

Commit df60dbf

Browse files
authored
Fix incorrect locale Tr for gpg command (#29754)
1 parent e01b001 commit df60dbf

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

options/locale/locale_en-US.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,6 @@ gpg_invalid_token_signature = The provided GPG key, signature and token do not m
804804
gpg_token_required = You must provide a signature for the below token
805805
gpg_token = Token
806806
gpg_token_help = You can generate a signature using:
807-
gpg_token_code = echo "%s" | gpg -a --default-key %s --detach-sig
808807
gpg_token_signature = Armored GPG signature
809808
key_signature_gpg_placeholder = Begins with '-----BEGIN PGP SIGNATURE-----'
810809
verify_gpg_key_success = GPG key "%s" has been verified.

templates/user/settings/keys_gpg.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<input readonly="" value="{{.TokenToSign}}">
2323
<div class="help">
2424
<p>{{ctx.Locale.Tr "settings.gpg_token_help"}}</p>
25-
<p><code>{{ctx.Locale.Tr "settings.gpg_token_code" .TokenToSign .PaddedKeyID}}</code></p>
25+
<p><code>{{printf `echo "%s" | gpg -a --default-key %s --detach-sig` .TokenToSign .PaddedKeyID}}</code></p>
2626
</div>
2727
</div>
2828
<div class="field">
@@ -90,7 +90,7 @@
9090
<input readonly="" value="{{$.TokenToSign}}">
9191
<div class="help">
9292
<p>{{ctx.Locale.Tr "settings.gpg_token_help"}}</p>
93-
<p><code>{{ctx.Locale.Tr "settings.gpg_token_code" $.TokenToSign .PaddedKeyID}}</code></p>
93+
<p><code>{{printf `echo "%s" | gpg -a --default-key %s --detach-sig` $.TokenToSign .PaddedKeyID}}</code></p>
9494
</div>
9595
<br>
9696
</div>

0 commit comments

Comments
 (0)