Merge branch 'twang2218/gitlab-ee-ee-i18n-extract-app/views/layouts' into 'master'

i18n: externalize strings from 'app/views/layouts'

See merge request gitlab-org/gitlab-ee!8587

app/views/layouts/devise.html.haml

@@ -28,7 +28,7 @@
                 = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text)
 
               - if Gitlab::CurrentSettings.help_text.present?
-                %h3 Need help?
+                %h3= _("Need help?")
                 %hr
                 %p.slead
                   = markdown(Gitlab::CurrentSettings.help_text)

app/views/layouts/nav/sidebar/_admin.html.haml

@@ -138,12 +138,12 @@
           .nav-icon-container
             = sprite_icon('license')
           %span.nav-item-name
-            License
+            = _('License')
         %ul.sidebar-sub-level-items.is-fly-out-only
           = nav_link(controller: :licenses, html_options: { class: "fly-out-top-item" } ) do
             = link_to admin_license_path do
               %strong.fly-out-top-item-name
-                #{ _('License') }
+                = _('License')
 
       - if akismet_enabled?
         = nav_link(controller: :spam_logs) do
@@ -163,12 +163,12 @@
           .nav-icon-container
             = sprite_icon('push-rules')
           %span.nav-item-name
-            Push Rules
+            = _('Push Rules')
         %ul.sidebar-sub-level-items.is-fly-out-only
           = nav_link(controller: :push_rules, html_options: { class: "fly-out-top-item" } ) do
             = link_to admin_push_rule_path do
               %strong.fly-out-top-item-name
-                #{ _('Push Rules') }
+                = _('Push Rules')
 
       = nav_link(controller: %w(admin/geo/nodes admin/geo/projects)) do
         = link_to admin_geo_nodes_path, class: "qa-link-geo-menu" do
@@ -190,7 +190,7 @@
             = nav_link(path: 'admin/geo/projects#index') do
               = link_to admin_geo_projects_path, title: 'Projects' do
                 %span
-                  #{ _('Projects') }
+                  = _('Projects')
 
       = nav_link(controller: :deploy_keys) do
         = link_to admin_deploy_keys_path do

app/views/layouts/nav/sidebar/_profile.html.haml

@@ -34,7 +34,7 @@
             .nav-icon-container
               = custom_icon('credit_card')
             %span.nav-item-name
-              Billing
+              = _("Billing")
           %ul.sidebar-sub-level-items.is-fly-out-only
             = nav_link(controller: :billings, html_options: { class: "fly-out-top-item" } ) do
               = link_to profile_billings_path do
@@ -167,11 +167,11 @@
           .nav-icon-container
             = custom_icon('pipeline')
           %span.nav-item-name
-            Pipeline quota
+            = _('Pipeline quota')
         %ul.sidebar-sub-level-items.is-fly-out-only
           = nav_link(path: 'profiles#pipeline_quota', html_options: { class: "fly-out-top-item" } ) do
             = link_to profile_pipeline_quota_path do
               %strong.fly-out-top-item-name
-                #{ _('Pipeline quota') }
+                = _('Pipeline quota')
 
     = render 'shared/sidebar_toggle_button'

locale/gitlab.pot

@@ -5475,6 +5475,9 @@ msgstr ""
 msgid "Nav|Sign out and sign in with a different account"
 msgstr ""
 
+msgid "Need help?"
+msgstr ""
+
 msgid "Network"
 msgstr ""