Merge branch 'eread/improve-repo-maintenance-ui-strings' into 'master'

Avoid splitting strings in repository maintenance UI

See merge request gitlab-org/gitlab!65717

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

@@ -10,9 +10,7 @@
           = f.label :repository_checks_enabled, class: 'form-check-label' do
             = _("Enable repository checks")
           .form-text.text-muted
-            = _("Run")
-            %code= _("git fsck")
-            = _("periodically in all project and wiki repositories to look for silent disk corruption issues.")
+            = html_escape(s_('Run %{code_start}git fsck%{code_end} periodically in all project and wiki repositories to look for silent disk corruption issues.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
       .form-group
         .form-text.text-muted
           = _("If you get a lot of false alarms from repository checks, you can clear all repository check information from the database.")
@@ -41,22 +39,16 @@
         = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'label-bold'
         = f.number_field :housekeeping_incremental_repack_period, class: 'form-control gl-form-input'
         .form-text.text-muted
-          = _("Number of Git pushes after which an incremental")
-          %code= _("git repack")
-          = _("is run.")
+          = html_escape(s_('Number of Git pushes after which an incremental %{code_start}git repack%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
       .form-group
         = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'label-bold'
         = f.number_field :housekeeping_full_repack_period, class: 'form-control gl-form-input'
         .form-text.text-muted
-          = _("Number of Git pushes after which a full")
-          %code= _("git repack")
-          = _("is run.")
+          = html_escape(s_('Number of Git pushes after which a full %{code_start}git repack%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
       .form-group
         = f.label :housekeeping_gc_period, _('Git GC period'), class: 'label-bold'
         = f.number_field :housekeeping_gc_period, class: 'form-control gl-form-input'
         .form-text.text-muted
-          = _("Number of Git pushes after which")
-          %code= _("git gc")
-          = _("is run.")
+          = html_escape(s_('Number of Git pushes after which %{code_start}git gc%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

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

@@ -43,11 +43,11 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Configure')
-      = link_to s_('repository checks'), help_page_path('administration/repository_checks.md'), target: '_blank', rel: 'noopener noreferrer'
-      = _('and')
-      = link_to s_('housekeeping'), help_page_path('administration/housekeeping.md'), target: '_blank', rel: 'noopener noreferrer'
-      = _('on repositories.')
+      - repository_checks_link_url = help_page_path('administration/repository_checks.md')
+      - repository_checks_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: repository_checks_link_url }
+      - housekeeping_link_url = help_page_path('administration/housekeeping.md')
+      - housekeeping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: housekeeping_link_url }
+      = html_escape(s_('Configure %{repository_checks_link_start}repository checks%{link_end} and %{housekeeping_link_start}housekeeping%{link_end} on repositories.')) % { repository_checks_link_start: repository_checks_link_start, housekeeping_link_start: housekeeping_link_start, link_end: '</a>'.html_safe }
   .settings-content
     = render 'repository_check'
 

locale/gitlab.pot

@@ -8237,15 +8237,15 @@ msgstr ""
 msgid "Configuration help"
 msgstr ""
 
-msgid "Configure"
-msgstr ""
-
 msgid "Configure %{italic_start}What's new%{italic_end} drawer and content."
 msgstr ""
 
 msgid "Configure %{link} to track events. %{link_start}Learn more.%{link_end}"
 msgstr ""
 
+msgid "Configure %{repository_checks_link_start}repository checks%{link_end} and %{housekeeping_link_start}housekeeping%{link_end} on repositories."
+msgstr ""
+
 msgid "Configure GitLab runners to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}"
 msgstr ""
 
@@ -22622,13 +22622,13 @@ msgstr ""
 msgid "Number of Elasticsearch shards and replicas (per index)"
 msgstr ""
 
-msgid "Number of Git pushes after which"
+msgid "Number of Git pushes after which %{code_start}git gc%{code_end} is run."
 msgstr ""
 
-msgid "Number of Git pushes after which a full"
+msgid "Number of Git pushes after which a full %{code_start}git repack%{code_end} is run."
 msgstr ""
 
-msgid "Number of Git pushes after which an incremental"
+msgid "Number of Git pushes after which an incremental %{code_start}git repack%{code_end} is run."
 msgstr ""
 
 msgid "Number of LOCs per commit"
@@ -28140,7 +28140,7 @@ msgstr ""
 msgid "Rules that define what git pushes are accepted for a project. All newly created projects will use these settings."
 msgstr ""
 
-msgid "Run"
+msgid "Run %{code_start}git fsck%{code_end} periodically in all project and wiki repositories to look for silent disk corruption issues."
 msgstr ""
 
 msgid "Run CI/CD pipelines for external repositories"
@@ -38758,15 +38758,6 @@ msgid_plural "from %d jobs"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "git fsck"
-msgstr ""
-
-msgid "git gc"
-msgstr ""
-
-msgid "git repack"
-msgstr ""
-
 msgid "group"
 msgstr ""
 
@@ -38800,9 +38791,6 @@ msgstr ""
 msgid "here"
 msgstr ""
 
-msgid "housekeeping"
-msgstr ""
-
 msgid "http:"
 msgstr ""
 
@@ -38898,9 +38886,6 @@ msgstr ""
 msgid "is read-only"
 msgstr ""
 
-msgid "is run."
-msgstr ""
-
 msgid "is too long (%{current_value}). The maximum size is %{max_size}."
 msgstr ""
 
@@ -39401,9 +39386,6 @@ msgstr ""
 msgid "nounSeries|%{item}, and %{lastItem}"
 msgstr ""
 
-msgid "on repositories."
-msgstr ""
-
 msgid "on track"
 msgstr ""
 
@@ -39447,9 +39429,6 @@ msgstr ""
 msgid "per day"
 msgstr ""
 
-msgid "periodically in all project and wiki repositories to look for silent disk corruption issues."
-msgstr ""
-
 msgid "personal access token"
 msgstr ""
 
@@ -39555,9 +39534,6 @@ msgid_plural "replies"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "repository checks"
-msgstr ""
-
 msgid "repository:"
 msgstr ""