Automatic merge of gitlab-org/gitlab-ce master

app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml

@@ -8,5 +8,5 @@
       %h4= s_('ClusterIntegration|Did you know?')
       %p= s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link }
       %a.btn.btn-default{ href: 'https://goo.gl/AaJzRW', target: '_blank', rel: 'noopener noreferrer' }
-        Apply for credit
+        = s_("ClusterIntegration|Apply for credit")
 

app/views/clusters/clusters/index.html.haml

-- breadcrumb_title 'Kubernetes'
-- page_title "Kubernetes Clusters"
+- breadcrumb_title _('Kubernetes')
+- page_title _('Kubernetes Clusters')
 
 = render_gcp_signup_offer
 
@@ -9,12 +9,12 @@
   - else
     .top-area.adjust
       .nav-text
-        = s_("ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project")
+        = s_('ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project')
       = render 'clusters/clusters/buttons'
 
     - if @has_ancestor_clusters
       .bs-callout.bs-callout-info
-        = s_("ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters.")
+        = s_('ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters.')
         %strong
           = link_to _('More information'), help_page_path('user/group/clusters/', anchor: 'cluster-precedence')
 

app/views/clusters/clusters/new.html.haml

-- breadcrumb_title 'Kubernetes'
-- page_title _("Kubernetes Cluster")
+- breadcrumb_title _('Kubernetes')
+- page_title _('Kubernetes Cluster')
 - active_tab = local_assigns.fetch(:active_tab, 'gcp')
 = javascript_include_tag 'https://apis.google.com/js/api.js'
 

app/views/clusters/clusters/show.html.haml

 - @content_class = "limit-container-width" unless fluid_layout
-- add_to_breadcrumbs "Kubernetes Clusters", clusterable.index_path
+- add_to_breadcrumbs _('Kubernetes Clusters'), clusterable.index_path
 - breadcrumb_title @cluster.name
-- page_title _("Kubernetes Cluster")
+- page_title _('Kubernetes Cluster')
 - manage_prometheus_path = edit_project_service_path(@cluster.project, 'prometheus') if @project
 
 - expanded = Rails.env.test?
@@ -43,7 +43,7 @@
     .settings-header
       %h4= s_('ClusterIntegration|Kubernetes cluster details')
       %button.btn.js-settings-toggle{ type: 'button' }
-        = expanded ? 'Collapse' : 'Expand'
+        = expanded ? _('Collapse') : _('Expand')
       %p= s_('ClusterIntegration|See and edit the details for your Kubernetes cluster')
     .settings-content
       - if @cluster.managed?
@@ -55,7 +55,7 @@
     .settings-header
       %h4= _('Advanced settings')
       %button.btn.js-settings-toggle{ type: 'button' }
-        = expanded ? 'Collapse' : 'Expand'
+        = expanded ? _('Collapse') : _('Expand')
       %p= s_("ClusterIntegration|Advanced options on this Kubernetes cluster's integration")
     .settings-content
       = render 'advanced_settings'

changelogs/unreleased/gt-externalize-app-views-clusters.yml

+---
+title: Externalize strings from `/app/views/clusters`
+merge_request: 24666
+author: George Tsiolis
+type: other

doc/development/i18n/externalization.md

@@ -228,6 +228,16 @@ This makes use of [`Intl.DateTimeFormat`].
 
 [`Intl.DateTimeFormat`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat
 
+- In Ruby/HAML, we have two ways of adding format to dates and times:
+
+  1. **Through the `l` helper**, i.e. `l(active_session.created_at, format: :short)`. We have some predefined formats for
+[dates](https://gitlab.com/gitlab-org/gitlab-ce/blob/v11.7.0/config/locales/en.yml#L54) and [times](https://gitlab.com/gitlab-org/gitlab-ce/blob/v11.7.0/config/locales/en.yml#L261).
+  If you need to add a new format, because other parts of the code could benefit from it,
+  you'll need to add it to [en.yml](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/locales/en.yml) file.
+  2. **Through `strftime`**, i.e. `milestone.start_date.strftime('%b %-d')`. We use `strftime` in case none of the formats
+  defined on [en.yml](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/locales/en.yml) matches the date/time 
+  specifications we need, and if there is no need to add it as a new format because is very particular (i.e. it's only used in a single view).
+
 ## Best practices
 
 ### Splitting sentences

locale/gitlab.pot

@@ -1930,6 +1930,9 @@ msgstr ""
 msgid "ClusterIntegration|Applications"
 msgstr ""
 
+msgid "ClusterIntegration|Apply for credit"
+msgstr ""
+
 msgid "ClusterIntegration|Are you sure you want to remove this Kubernetes cluster's integration? This will not delete your actual Kubernetes cluster."
 msgstr ""
 
@@ -5211,6 +5214,9 @@ msgstr ""
 msgid "Kubernetes Cluster"
 msgstr ""
 
+msgid "Kubernetes Clusters"
+msgstr ""
+
 msgid "Kubernetes cluster creation time exceeds timeout; %{timeout}"
 msgstr ""