Merge branch 'Externalize-strings-in-_spam.html.haml' into 'master'

Externalize strings in application_settings/_spam.html.haml

See merge request gitlab-org/gitlab!58076

app/views/admin/application_settings/_spam.html.haml

@@ -6,25 +6,25 @@
       .form-check
         = f.check_box :recaptcha_enabled, class: 'form-check-input'
         = f.label :recaptcha_enabled, class: 'form-check-label' do
-          Enable reCAPTCHA
+          = _("Enable reCAPTCHA")
         %span.form-text.text-muted#recaptcha_help_block
           = _('Helps prevent bots from creating accounts.')
     .form-group
       .form-check
         = f.check_box :login_recaptcha_protection_enabled, class: 'form-check-input'
         = f.label :login_recaptcha_protection_enabled, class: 'form-check-label' do
-          Enable reCAPTCHA for login
+          = _("Enable reCAPTCHA for login")
         %span.form-text.text-muted#recaptcha_help_block
           = _('Helps prevent bots from brute-force attacks.')
     .form-group
-      = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'label-bold'
+      = f.label :recaptcha_site_key, _('reCAPTCHA Site Key'), class: 'label-bold'
       = f.text_field :recaptcha_site_key, class: 'form-control gl-form-input'
       .form-text.text-muted
-        Generate site and private keys at
+        = _("Generate site and private keys at")
         %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha
 
     .form-group
-      = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'label-bold'
+      = f.label :recaptcha_private_key, _('reCAPTCHA Private Key'), class: 'label-bold'
     .form-group
       = f.text_field :recaptcha_private_key, class: 'form-control gl-form-input'
 
@@ -41,10 +41,10 @@
         = f.check_box :akismet_enabled, class: 'form-check-input'
         = f.label :akismet_enabled, class: 'form-check-label' do
           Enable Akismet
-        %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues
+        %span.form-text.text-muted#akismet_help_block= _("Helps prevent bots from creating issues")
 
     .form-group
-      = f.label :akismet_api_key, 'Akismet API Key', class: 'label-bold'
+      = f.label :akismet_api_key, _('Akismet API Key'), class: 'label-bold'
       = f.text_field :akismet_api_key, class: 'form-control gl-form-input'
       .form-text.text-muted
         Generate API key at
@@ -54,21 +54,21 @@
       .form-check
         = f.check_box :unique_ips_limit_enabled, class: 'form-check-input'
         = f.label :unique_ips_limit_enabled, class: 'form-check-label' do
-          Limit sign in from multiple ips
+          = _("Limit sign in from multiple ips")
         %span.form-text.text-muted#unique_ip_help_block
-          Helps prevent malicious users hide their activity
+          = _("Helps prevent malicious users hide their activity")
 
     .form-group
-      = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'label-bold'
+      = f.label :unique_ips_limit_per_user, _('IPs per user'), class: 'label-bold'
       = f.number_field :unique_ips_limit_per_user, class: 'form-control gl-form-input'
       .form-text.text-muted
-        Maximum number of unique IPs per user
+        = _("Maximum number of unique IPs per user")
 
     .form-group
-      = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'label-bold'
+      = f.label :unique_ips_limit_time_window, _('IP expiration time'), class: 'label-bold'
       = f.number_field :unique_ips_limit_time_window, class: 'form-control gl-form-input'
       .form-text.text-muted
-        How many seconds an IP will be counted towards the limit
+        = _("How many seconds an IP will be counted towards the limit")
 
     .form-group
       .form-check
@@ -79,4 +79,4 @@
       = f.label :spam_check_endpoint_url, _('URL of the external Spam Check endpoint'), class: 'label-bold'
       = f.text_field :spam_check_endpoint_url, class: 'form-control gl-form-input'
 
-  = f.submit 'Save changes', class: "gl-button btn btn-confirm"
+  = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

changelogs/unreleased/Externalize-strings-in-_spam-html-haml.yml

+---
+title: Externalize strings in application_settings/_spam.html.haml
+merge_request: 58076
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -2783,6 +2783,9 @@ msgstr ""
 msgid "After you've reviewed these contribution guidelines, you'll be all set to"
 msgstr ""
 
+msgid "Akismet API Key"
+msgstr ""
+
 msgid "Alert"
 msgid_plural "Alerts"
 msgstr[0] ""
@@ -12071,6 +12074,12 @@ msgstr ""
 msgid "Enable proxy"
 msgstr ""
 
+msgid "Enable reCAPTCHA"
+msgstr ""
+
+msgid "Enable reCAPTCHA for login"
+msgstr ""
+
 msgid "Enable reCAPTCHA, Invisible Captcha, Akismet and set IP limits. For reCAPTCHA, we currently only support %{recaptcha_v2_link_start}v2%{recaptcha_v2_link_end}"
 msgstr ""
 
@@ -14188,6 +14197,9 @@ msgstr ""
 msgid "Generate new token"
 msgstr ""
 
+msgid "Generate site and private keys at"
+msgstr ""
+
 msgid "Generic package file size in bytes"
 msgstr ""
 
@@ -15970,6 +15982,12 @@ msgstr ""
 msgid "Helps prevent bots from creating accounts."
 msgstr ""
 
+msgid "Helps prevent bots from creating issues"
+msgstr ""
+
+msgid "Helps prevent malicious users hide their activity"
+msgstr ""
+
 msgid "Helps reduce alert volume (e.g. if creating too many issues)"
 msgstr ""
 
@@ -16121,6 +16139,9 @@ msgstr ""
 msgid "How many replicas each Elasticsearch shard has."
 msgstr ""
 
+msgid "How many seconds an IP will be counted towards the limit"
+msgstr ""
+
 msgid "How many shards to split the Elasticsearch index over."
 msgstr ""
 
@@ -16205,9 +16226,15 @@ msgstr ""
 msgid "IP Address"
 msgstr ""
 
+msgid "IP expiration time"
+msgstr ""
+
 msgid "IP subnet restriction only allowed for top-level groups"
 msgstr ""
 
+msgid "IPs per user"
+msgstr ""
+
 msgid "Identifier"
 msgstr ""
 
@@ -19173,6 +19200,9 @@ msgstr ""
 msgid "Limit namespaces and projects that can be indexed"
 msgstr ""
 
+msgid "Limit sign in from multiple ips"
+msgstr ""
+
 msgid "Limit the number of concurrent operations this secondary node can run in the background."
 msgstr ""
 
@@ -19760,6 +19790,9 @@ msgstr ""
 msgid "Maximum number of projects."
 msgstr ""
 
+msgid "Maximum number of unique IPs per user"
+msgstr ""
+
 msgid "Maximum page reached"
 msgstr ""
 
@@ -38084,6 +38117,12 @@ msgstr ""
 msgid "quick actions"
 msgstr ""
 
+msgid "reCAPTCHA Private Key"
+msgstr ""
+
+msgid "reCAPTCHA Site Key"
+msgstr ""
+
 msgid "recent activity"
 msgstr ""