Remove duplicate option in admin screen and now-unused translation keys (#28492)...

Backport #28492
Fix #30019

Co-authored-by: The Magician <142242365+TheMagician23@users.noreply.github.com>

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1dad0002493c8fbccf67b608abd9c0cad2b12354..791b9396bd05a033bc5230eed12743335251b4b3 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3078,7 +3078,6 @@ config.enable_openid_signin = Enable OpenID Sign-In
 config.show_registration_button = Show Register Button
 config.require_sign_in_view = Require Sign-In to View Pages
 config.mail_notify = Enable Email Notifications
-config.disable_key_size_check = Disable Minimum Key Size Check
 config.enable_captcha = Enable CAPTCHA
 config.active_code_lives = Active Code Lives
 config.reset_password_code_lives = Recover Account Code Expiry Time

diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 7eb9d086e61cc2b5f6ed930c3680d37bda5e48d0..1cc4b7bb09ae55df55118e17eb987fa0cb157ee5 100644 (file)
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -151,8 +151,6 @@
                                <dd>{{if .Service.RequireSignInView}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
                                <dt>{{ctx.Locale.Tr "admin.config.mail_notify"}}</dt>
                                <dd>{{if .Service.EnableNotifyMail}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-                               <dt>{{ctx.Locale.Tr "admin.config.disable_key_size_check"}}</dt>
-                               <dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
                                <dt>{{ctx.Locale.Tr "admin.config.enable_captcha"}}</dt>
                                <dd>{{if .Service.EnableCaptcha}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
                                <dt>{{ctx.Locale.Tr "admin.config.default_keep_email_private"}}</dt>