Merge branch 'i18n-projects-new' into 'master'

Externalize strings of  page '/projects/new'

See merge request gitlab-org/gitlab-ce!30447

4 files changed, 78 insertions, 23 deletions

diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml
index e423631ec99..7541737f79c 100644
--- a/app/views/projects/_new_project_fields.html.haml
+++ b/app/views/projects/_new_project_fields.html.haml
@@ -36,17 +36,17 @@
     = f.text_field :path, placeholder: "my-awesome-project", class: "form-control", required: true
 - if current_user.can_create_group?
   .form-text.text-muted
-    Want to house several dependent projects under the same namespace?
-    = link_to "Create a group.", new_group_path
+    - link_start_group_path = '<a href="%{path}">' % { path: new_group_path }
+    - project_tip = s_('ProjectsNew|Want to house several dependent projects under the same namespace? %{link_start}Create a group.%{link_end}') % { link_start: link_start_group_path, link_end: '</a>' }
+    = project_tip.html_safe
 
 .form-group
   = f.label :description, class: 'label-bold' do
-    Project description
-    %span (optional)
-  = f.text_area :description, placeholder: 'Description format', class: "form-control", rows: 3, maxlength: 250, data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "project_description", track_value: "" }
+    = s_('ProjectsNew|Project description %{tag_start}(optional)%{tag_end}').html_safe % { tag_start: '<span>'.html_safe, tag_end: '</span>'.html_safe }
+  = f.text_area :description, placeholder: s_('ProjectsNew|Description format'), class: "form-control", rows: 3, maxlength: 250, data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "project_description", track_value: "" }
 
 = f.label :visibility_level, class: 'label-bold' do
-  Visibility Level
+  = s_('ProjectsNew|Visibility Level')
   = link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: 'Documentation for Visibility Level' }, target: '_blank', rel: 'noopener noreferrer'
 = render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false
 
@@ -57,9 +57,9 @@
         = check_box_tag 'project[initialize_with_readme]', '1', false, class: 'form-check-input qa-initialize-with-readme-checkbox', data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "init_with_readme" }
         = label_tag 'project[initialize_with_readme]', class: 'form-check-label' do
           .option-title
-            %strong Initialize repository with a README
+            %strong= s_('ProjectsNew|Initialize repository with a README')
           .option-description
-            Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository.
+            = s_('ProjectsNew|Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository.')
 
-= f.submit 'Create project', class: "btn btn-success project-submit", data: { track_label: "#{track_label}", track_event: "click_button", track_property: "create_project", track_value: "" }
-= link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel', data: { track_label: "#{track_label}", track_event: "click_button", track_property: "cancel" }
+= f.submit _('Create project'), class: "btn btn-success project-submit", data: { track_label: "#{track_label}", track_event: "click_button", track_property: "create_project", track_value: "" }
+= link_to _('Cancel'), dashboard_projects_path, class: 'btn btn-cancel', data: { track_label: "#{track_label}", track_event: "click_button", track_property: "cancel" }
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 1cfe302fdc7..33de0aa153b 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -1,7 +1,7 @@
 - @hide_breadcrumbs = true
 - @hide_top_links = true
-- page_title    'New Project'
-- header_title  "Projects", dashboard_projects_path
+- page_title    _('New Project')
+- header_title  _("Projects"), dashboard_projects_path
 - active_tab = local_assigns.fetch(:active_tab, 'blank')
 
 .project-edit-container.prepend-top-default
@@ -33,16 +33,16 @@
       %ul.nav.nav-tabs.nav-links.gitlab-tabs{ role: 'tablist' }
         %li.nav-item{ role: 'presentation' }
           %a.nav-link.active{ href: '#blank-project-pane', id: 'blank-project-tab', data: { toggle: 'tab', track_label: 'blank_project', track_event: "click_tab" }, role: 'tab' }
-            %span.d-none.d-sm-block Blank project
-            %span.d-block.d-sm-none Blank
+            %span.d-none.d-sm-block= s_('ProjectsNew|Blank project')
+            %span.d-block.d-sm-none= s_('ProjectsNew|Blank')
         %li.nav-item{ role: 'presentation' }
           %a.nav-link{ href: '#create-from-template-pane', id: 'create-from-template-tab', data: { toggle: 'tab', track_label: 'create_from_template', track_event: "click_tab" }, role: 'tab' }
-            %span.d-none.d-sm-block.qa-project-create-from-template-tab Create from template
-            %span.d-block.d-sm-none Template
+            %span.d-none.d-sm-block.qa-project-create-from-template-tab= s_('ProjectsNew|Create from template')
+            %span.d-block.d-sm-none= s_('ProjectsNew|Template')
         %li.nav-item{ role: 'presentation' }
           %a.nav-link{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab', track_label: 'import_project', track_event: "click_tab" }, role: 'tab' }
-            %span.d-none.d-sm-block Import project
-            %span.d-block.d-sm-none Import
+            %span.d-none.d-sm-block= s_('ProjectsNew|Import project')
+            %span.d-block.d-sm-none= s_('ProjectsNew|Import')
         = render_if_exists 'projects/new_ci_cd_only_project_tab', active_tab: active_tab
 
       .tab-content.gitlab-tab-content
@@ -67,8 +67,8 @@
             = render 'import_project_pane', active_tab: active_tab
           - else
             .nothing-here-block
-              %h4 No import options available
-              %p Contact an administrator to enable options for importing your project.
+              %h4= s_('ProjectsNew|No import options available')
+              %p= s_('ProjectsNew|Contact an administrator to enable options for importing your project.')
 
         = render_if_exists 'projects/new_ci_cd_only_project_pane', active_tab: active_tab
 
@@ -76,5 +76,6 @@
   .center
     %h2
       %i.fa.fa-spinner.fa-spin
-      Creating project &amp; repository.
-    %p Please wait a moment, this page will automatically refresh when ready.
+      = s_('ProjectsNew|Creating project & repository.')
+    %p
+      = s_('ProjectsNew|Please wait a moment, this page will automatically refresh when ready.')
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9b6e8d8c8a4..a4fee96753d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3263,6 +3263,9 @@ msgstr ""
 msgid "Create new..."
 msgstr ""
 
+msgid "Create project"
+msgstr ""
+
 msgid "Create project label"
 msgstr ""
 
@@ -6752,6 +6755,9 @@ msgstr ""
 msgid "New Pipeline Schedule"
 msgstr ""
 
+msgid "New Project"
+msgstr ""
+
 msgid "New Snippet"
 msgstr ""
 
@@ -8425,6 +8431,54 @@ msgstr ""
 msgid "ProjectsDropdown|This feature requires browser localStorage support"
 msgstr ""
 
+msgid "ProjectsNew|Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository."
+msgstr ""
+
+msgid "ProjectsNew|Blank"
+msgstr ""
+
+msgid "ProjectsNew|Blank project"
+msgstr ""
+
+msgid "ProjectsNew|Contact an administrator to enable options for importing your project."
+msgstr ""
+
+msgid "ProjectsNew|Create from template"
+msgstr ""
+
+msgid "ProjectsNew|Creating project & repository."
+msgstr ""
+
+msgid "ProjectsNew|Description format"
+msgstr ""
+
+msgid "ProjectsNew|Import"
+msgstr ""
+
+msgid "ProjectsNew|Import project"
+msgstr ""
+
+msgid "ProjectsNew|Initialize repository with a README"
+msgstr ""
+
+msgid "ProjectsNew|No import options available"
+msgstr ""
+
+msgid "ProjectsNew|Please wait a moment, this page will automatically refresh when ready."
+msgstr ""
+
+msgid "ProjectsNew|Project description %{tag_start}(optional)%{tag_end}"
+msgstr ""
+
+msgid "ProjectsNew|Template"
+msgstr ""
+
+msgid "ProjectsNew|Visibility Level"
+msgstr ""
+
+msgid "ProjectsNew|Want to house several dependent projects under the same namespace? %{link_start}Create a group.%{link_end}"
+msgstr ""
+
 msgid "PrometheusService|%{exporters} with %{metrics} were found"
 msgstr ""
 
diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb
index defd85a5740..0918445d119 100644
--- a/qa/qa/page/project/new.rb
+++ b/qa/qa/page/project/new.rb
@@ -18,7 +18,7 @@ module QA
           element :project_name, 'text_field :name' # rubocop:disable QA/ElementWithPattern
           element :project_path, 'text_field :path' # rubocop:disable QA/ElementWithPattern
           element :project_description, 'text_area :description' # rubocop:disable QA/ElementWithPattern
-          element :project_create_button, "submit 'Create project'" # rubocop:disable QA/ElementWithPattern
+          element :project_create_button, "submit _('Create project')" # rubocop:disable QA/ElementWithPattern
           element :visibility_radios, 'visibility_level:' # rubocop:disable QA/ElementWithPattern
         end