Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

4 files changed, 34 insertions, 33 deletions

diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 03f8539293b..a56eaaf685f 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -13,19 +13,20 @@
 
 - unless Gitlab::CurrentSettings.help_page_hide_commercial_content?
   %p.slead
-    GitLab is open source software to collaborate on code.
+    = _('GitLab is open source software to collaborate on code.')
     %br
-    Manage git repositories with fine-grained access controls that keep your code secure.
+    = _('Manage git repositories with fine-grained access controls that keep your code secure.')
     %br
-    Perform code reviews and enhance collaboration with merge requests.
+    = _('Perform code reviews and enhance collaboration with merge requests.')
     %br
-    Each project can also have an issue tracker and a wiki.
+    = _('Each project can also have an issue tracker and a wiki.')
     %br
-    Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.
+    = _('Used by more than 100,000 organizations, GitLab is the most popular solution to manage git repositories on-premises.')
     %br
-    Read more about GitLab at #{link_to promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer'}.
+    - link_to_promo = link_to(promo_host, promo_url, target: '_blank', rel: 'noopener noreferrer')
+    = _("Read more about GitLab at %{link_to_promo}.").html_safe % { link_to_promo: link_to_promo }
 
-%p= link_to 'Check the current instance configuration ', help_instance_configuration_url
+%p= link_to _('Check the current instance configuration '), help_instance_configuration_url
 %hr
 
 .row.gl-mt-3
@@ -35,15 +36,15 @@
   .col-md-4
     .card.links-card
       .card-header
-        Quick help
+        = _('Quick help')
       %ul.content-list
-        %li= link_to 'See our website for getting help', support_url
+        %li= link_to _('See our website for getting help'), support_url
         %li
           %button.btn-blank.btn-link.js-trigger-search-bar{ type: 'button' }
-            Use the search bar on the top of this page
+            = _('Use the search bar on the top of this page')
         %li
           %button.btn-blank.btn-link.js-trigger-shortcut{ type: 'button' }
-            Use shortcuts
+            = _('Use shortcuts')
         - unless Gitlab::CurrentSettings.help_page_hide_commercial_content?
-          %li= link_to 'Get a support subscription', 'https://about.gitlab.com/pricing/'
-          %li= link_to 'Compare GitLab editions', 'https://about.gitlab.com/features/#compare'
+          %li= link_to _('Get a support subscription'), 'https://about.gitlab.com/pricing/'
+          %li= link_to _('Compare GitLab editions'), 'https://about.gitlab.com/features/#compare'
diff --git a/app/views/help/instance_configuration.html.haml b/app/views/help/instance_configuration.html.haml
index 260566b1441..1cd05dcf65e 100644
--- a/app/views/help/instance_configuration.html.haml
+++ b/app/views/help/instance_configuration.html.haml
@@ -1,15 +1,15 @@
 - page_title _('Instance Configuration')
 .documentation.md
-  %h1 Instance Configuration
+  %h1= _('Instance Configuration')
 
   %p
-    In this page you will find information about the settings that are used in your current instance.
+    = _("In this page you will find information about the settings that are used in your current instance.")
 
   = render 'help/instance_configuration/ssh_info'
   = render 'help/instance_configuration/gitlab_pages'
   = render 'help/instance_configuration/gitlab_ci'
   %p
-    %strong Table of contents
+    %strong= _("Table of contents")
 
     %ul
       = content_for :table_content
diff --git a/app/views/help/instance_configuration/_gitlab_ci.html.haml b/app/views/help/instance_configuration/_gitlab_ci.html.haml
index 7fa8bd086d4..53fa3f89873 100644
--- a/app/views/help/instance_configuration/_gitlab_ci.html.haml
+++ b/app/views/help/instance_configuration/_gitlab_ci.html.haml
@@ -1,24 +1,24 @@
 - content_for :table_content do
-  %li= link_to 'GitLab CI', '#gitlab-ci'
+  %li= link_to _('GitLab CI'), '#gitlab-ci'
 
 - content_for :settings_content do
   %h2#gitlab-ci
-    GitLab CI
+    = _('GitLab CI')
 
   %p
-    Below are the current settings regarding
-    = succeed('.') { link_to('GitLab CI', 'https://about.gitlab.com/gitlab-ci', target: '_blank') }
+    = _('Below are the current settings regarding')
+    = succeed('.') { link_to(_('GitLab CI'), 'https://about.gitlab.com/gitlab-ci', target: '_blank') }
 
   .table-responsive
     %table
       %thead
         %tr
-          %th Setting
+          %th= _('Setting')
           %th= instance_configuration_host(@instance_configuration.settings[:host])
-          %th Default
+          %th= _('Default')
       %tbody
         %tr
           - artifacts_size = @instance_configuration.settings[:gitlab_ci][:artifacts_max_size]
-          %td Artifacts maximum size
+          %td= _('Artifacts maximum size')
           %td= instance_configuration_human_size_cell(artifacts_size[:value])
           %td= instance_configuration_human_size_cell(artifacts_size[:default])
diff --git a/app/views/help/instance_configuration/_gitlab_pages.html.haml b/app/views/help/instance_configuration/_gitlab_pages.html.haml
index 94c25edaf82..55f043214f6 100644
--- a/app/views/help/instance_configuration/_gitlab_pages.html.haml
+++ b/app/views/help/instance_configuration/_gitlab_pages.html.haml
@@ -1,35 +1,35 @@
 - gitlab_pages = @instance_configuration.settings[:gitlab_pages]
 - content_for :table_content do
-  %li= link_to 'GitLab Pages', '#gitlab-pages'
+  %li= link_to _('GitLab Pages'), '#gitlab-pages'
 
 - content_for :settings_content do
   %h2#gitlab-pages
-    GitLab Pages
+    = _('GitLab Pages')
 
   %p
-    Below are the settings for
-    = succeed('.') { link_to('GitLab Pages', gitlab_pages[:url], target: '_blank') }
+    - link_to_gitlab_pages = link_to(_('GitLab Pages'), gitlab_pages[:url], target: '_blank')
+    = _('Below are the settings for %{link_to_gitlab_pages}.').html_safe % { link_to_gitlab_pages: link_to_gitlab_pages }
   .table-responsive
     %table
       %thead
         %tr
-          %th Setting
+          %th= _('Setting')
           %th= instance_configuration_host(@instance_configuration.settings[:host])
       %tbody
         %tr
-          %td Domain Name
+          %td= _('Domain Name')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:host])
         %tr
-          %td IP Address
+          %td= _('IP Address')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:ip_address])
         %tr
-          %td Port
+          %td= _('Port')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:port])
   %br
 
   %p
-    The maximum size of your Pages site is regulated by the artifacts maximum
-    size which is part of #{succeed('.') { link_to('GitLab CI', '#gitlab-ci') }}
+    - link_to_gitlab_ci = link_to(_('GitLab CI'), '#gitlab-ci')
+    = _("The maximum size of your Pages site is regulated by the artifacts maximum size which is part of %{link_to_gitlab_ci}.").html_safe % { link_to_gitlab_ci: link_to_gitlab_ci }