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

Externalize strings in /application_settings/_prometheus.html.haml

See merge request gitlab-org/gitlab!58030

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

@@ -3,31 +3,25 @@
 
   %fieldset
     %p
-      Enable a Prometheus metrics endpoint at
-      %code= metrics_path
-      to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available
-      = link_to 'here', admin_health_check_path
-      \. This setting requires a
-      = link_to 'restart', help_page_path('administration/restart_gitlab')
-      to take effect.
+      - link_to_restart = link_to(_('restart'), help_page_path('administration/restart_gitlab'))
+      = _('Enable a Prometheus metrics endpoint at %{metrics_path} to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available %{link}.').html_safe % { metrics_path: "<code>#{metrics_path}</code>".html_safe, link: link_to(_('here'), admin_health_check_path) }
+      = _('This setting requires a %{link_to_restart} to take effect.').html_safe % { link_to_restart: link_to_restart }
       = link_to sprite_icon('question-o'), help_page_path('administration/monitoring/prometheus/index')
     .form-group
       .form-check
         = f.check_box :prometheus_metrics_enabled, class: 'form-check-input'
         = f.label :prometheus_metrics_enabled, class: 'form-check-label' do
-          Enable Prometheus Metrics
+          = _("Enable Prometheus Metrics")
         - unless Gitlab::Metrics.metrics_folder_present?
           .form-text.text-muted
-            %strong.cred WARNING:
-            Environment variable
-            %code prometheus_multiproc_dir
-            does not exist or is not pointing to a valid directory.
+            %strong.cred= _("WARNING:")
+            = _("Environment variable %{code_start}%{environment_variable}%{code_end} does not exist or is not pointing to a valid directory.").html_safe % { environment_variable: prometheus_multiproc_dir, code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
             = link_to sprite_icon('question-o'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory')
     .form-group
-      = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'label-bold'
+      = f.label :metrics_method_call_threshold, _('Method Call Threshold (ms)'), class: 'label-bold'
       = f.number_field :metrics_method_call_threshold, class: 'form-control gl-form-input'
       .form-text.text-muted
         A method call is only tracked when it takes longer to complete than
         the given amount of milliseconds.
 
-  = 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-_prometheus-html-haml.yml

+---
+title: Externalise strings in /application_settings/_prometheus.html.haml
+merge_request: 58030
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -12038,6 +12038,9 @@ msgstr ""
 msgid "Enable PlantUML"
 msgstr ""
 
+msgid "Enable Prometheus Metrics"
+msgstr ""
+
 msgid "Enable Pseudonymizer data collection"
 msgstr ""
 
@@ -12059,6 +12062,9 @@ msgstr ""
 msgid "Enable What's new: Current tier only"
 msgstr ""
 
+msgid "Enable a Prometheus metrics endpoint at %{metrics_path} to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available %{link}."
+msgstr ""
+
 msgid "Enable access to Grafana"
 msgstr ""
 
@@ -12326,6 +12332,9 @@ msgstr ""
 msgid "Environment scope"
 msgstr ""
 
+msgid "Environment variable %{code_start}%{environment_variable}%{code_end} does not exist or is not pointing to a valid directory."
+msgstr ""
+
 msgid "Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default."
 msgstr ""
 
@@ -20416,6 +20425,9 @@ msgstr ""
 msgid "Method"
 msgstr ""
 
+msgid "Method Call Threshold (ms)"
+msgstr ""
+
 msgid "Metric was successfully added."
 msgstr ""
 
@@ -32879,6 +32891,9 @@ msgstr ""
 msgid "This setting can be overridden in each project."
 msgstr ""
 
+msgid "This setting requires a %{link_to_restart} to take effect."
+msgstr ""
+
 msgid "This setting will update the hostname that is used to generate private commit emails. %{learn_more}"
 msgstr ""
 
@@ -35628,6 +35643,9 @@ msgstr ""
 msgid "Vulnerability|Unmodified Response"
 msgstr ""
 
+msgid "WARNING:"
+msgstr ""
+
 msgid "Wait for the file to load to copy its contents"
 msgstr ""
 
@@ -37807,6 +37825,9 @@ msgstr ""
 msgid "help"
 msgstr ""
 
+msgid "here"
+msgstr ""
+
 msgid "http:"
 msgstr ""
 
@@ -38535,6 +38556,9 @@ msgstr ""
 msgid "reset it."
 msgstr ""
 
+msgid "restart"
+msgstr ""
+
 msgid "revised"
 msgstr ""