From 071d871dcf8dd8097dc0af6d4baf304a2fbbe4e2 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 14 Mar 2024 00:24:34 +0800 Subject: [PATCH] Fix incorrect locale Tr for gpg command (#29754) (cherry picked from commit df60dbfb9918081962614d063485337fb42e0ee7) --- options/locale/locale_en-US.ini | 1 - 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 f021fae153..7d6e827997 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -803,7 +803,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 293686ca96..2e26d69561 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -22,7 +22,7 @@

{{ctx.Locale.Tr "settings.gpg_token_help"}}

-

{{ctx.Locale.Tr "settings.gpg_token_code" .TokenToSign .PaddedKeyID}}

+

{{printf `echo "%s" | gpg -a --default-key %s --detach-sig` .TokenToSign .PaddedKeyID}}

@@ -90,7 +90,7 @@

{{ctx.Locale.Tr "settings.gpg_token_help"}}

-

{{ctx.Locale.Tr "settings.gpg_token_code" $.TokenToSign .PaddedKeyID}}

+

{{printf `echo "%s" | gpg -a --default-key %s --detach-sig` $.TokenToSign .PaddedKeyID}}