Merge branch 'gt-externalize-app-views-projects-milestones' into 'master'ee-1979-2-controller

Externalize strings from `/app/views/projects/milestones`

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

7 files changed, 75 insertions, 37 deletions

diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 56c043b2b3d..4779b5c434e 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -5,23 +5,23 @@
   .row
     .col-md-6
       .form-group.row
-        = f.label :title, "Title", class: "col-form-label col-sm-2"
+        = f.label :title, _('Title'), class: 'col-form-label col-sm-2'
         .col-sm-10
-          = f.text_field :title, maxlength: 255, class: "qa-milestone-title form-control", required: true, autofocus: true
+          = f.text_field :title, maxlength: 255, class: 'qa-milestone-title form-control', required: true, autofocus: true
       .form-group.row.milestone-description
-        = f.label :description, "Description", class: "col-form-label col-sm-2"
+        = f.label :description, _('Description'), class: 'col-form-label col-sm-2'
         .col-sm-10
           = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project) } do
-            = render 'projects/zen', f: f, attr: :description, classes: 'qa-milestone-description note-textarea', placeholder: 'Write milestone description...'
+            = render 'projects/zen', f: f, attr: :description, classes: 'qa-milestone-description note-textarea', placeholder: _('Write milestone description...')
             = render 'shared/notes/hints'
           .clearfix
           .error-alert
-    = render "shared/milestones/form_dates", f: f
+    = render 'shared/milestones/form_dates', f: f
 
   .form-actions
     - if @milestone.new_record?
-      = f.submit 'Create milestone', class: "btn-success btn qa-milestone-create-button"
-      = link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel"
+      = f.submit _('Create milestone'), class: 'btn-create btn qa-milestone-create-button'
+      = link_to _('Cancel'), project_milestones_path(@project), class: 'btn btn-cancel'
     - else
-      = f.submit 'Save changes', class: "btn-success btn"
-      = link_to "Cancel", project_milestone_path(@project, @milestone), class: "btn btn-cancel"
+      = f.submit _('Save changes'), class: 'btn-success btn'
+      = link_to _('Cancel'), project_milestone_path(@project, @milestone), class: 'btn btn-cancel'
diff --git a/app/views/projects/milestones/edit.html.haml b/app/views/projects/milestones/edit.html.haml
index 4006a468792..aa564e00af9 100644
--- a/app/views/projects/milestones/edit.html.haml
+++ b/app/views/projects/milestones/edit.html.haml
@@ -1,14 +1,14 @@
 - @no_container = true
-- breadcrumb_title "Edit"
-- add_to_breadcrumbs "Milestones", project_milestones_path(@project)
-- page_title "Edit", @milestone.title, "Milestones"
+- breadcrumb_title _('Edit')
+- add_to_breadcrumbs _('Milestones'), project_milestones_path(@project)
+- page_title _('Edit'), @milestone.title, _('Milestones')
 
 
 %div{ class: container_class }
 
   %h3.page-title
-    Edit Milestone
+    = _('Edit Milestone')
 
   %hr
 
-  = render "form"
+  = render 'form'
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index ba853ef0708..a3414c16d73 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -1,5 +1,5 @@
 - @no_container = true
-- page_title 'Milestones'
+- page_title _('Milestones')
 
 %div{ class: container_class }
   .top-area
@@ -9,8 +9,8 @@
       = render 'shared/milestones/search_form'
       = render 'shared/milestones_sort_dropdown'
       - if can?(current_user, :admin_milestone, @project)
-        = link_to new_project_milestone_path(@project), class: "btn btn-success qa-new-project-milestone", title: 'New milestone' do
-          New milestone
+        = link_to new_project_milestone_path(@project), class: 'btn btn-success qa-new-project-milestone', title: _('New milestone') do
+          = _('New milestone')
 
   .milestones
     #delete-milestone-modal
@@ -21,6 +21,6 @@
 
       - if @milestones.blank?
         %li
-          .nothing-here-block No milestones to show
+          .nothing-here-block= _('No milestones to show')
 
     = paginate @milestones, theme: 'gitlab'
diff --git a/app/views/projects/milestones/new.html.haml b/app/views/projects/milestones/new.html.haml
index 01cc951e8c2..79207fd70b5 100644
--- a/app/views/projects/milestones/new.html.haml
+++ b/app/views/projects/milestones/new.html.haml
@@ -1,12 +1,12 @@
 - @no_container = true
-- add_to_breadcrumbs "Milestones", project_milestones_path(@project)
-- breadcrumb_title "New"
-- page_title "New Milestone"
+- add_to_breadcrumbs _('Milestones'), project_milestones_path(@project)
+- breadcrumb_title _('New')
+- page_title _('New Milestone')
 
 %div{ class: container_class }
   %h3.page-title
-    New Milestone
+    = _('New Milestone')
 
   %hr
 
-  = render "form"
+  = render 'form'
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 5859de61d71..0542b349e44 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -1,30 +1,30 @@
 - @no_container = true
-- add_to_breadcrumbs "Milestones", project_milestones_path(@project)
+- add_to_breadcrumbs _('Milestones'), project_milestones_path(@project)
 - breadcrumb_title @milestone.title
-- page_title       @milestone.title, "Milestones"
+- page_title       @milestone.title, _('Milestones')
 - page_description @milestone.description
 
 %div{ class: container_class }
   .detail-page-header.milestone-page-header
     .status-box{ class: status_box_class(@milestone) }
       - if @milestone.closed?
-        Closed
+        = _('Closed')
       - elsif @milestone.expired?
-        Past due
+        = _('Past due')
       - elsif @milestone.upcoming?
-        Upcoming
+        = _('Upcoming')
       - else
-        Open
+        = _('Open')
     .header-text-content
       %span.identifier
         %strong
-          Milestone
+          = _('Milestone')
       - if @milestone.due_date || @milestone.start_date
         = milestone_date_range(@milestone)
     .milestone-buttons
       - if can?(current_user, :admin_milestone, @project)
-        = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped btn-nr" do
-          Edit
+        = link_to edit_project_milestone_path(@project, @milestone), class: 'btn btn-grouped btn-nr' do
+          = _('Edit')
 
         - if @project.group
           %button.js-promote-project-milestone-button.btn.btn-grouped{ data: { toggle: 'modal',
@@ -39,13 +39,13 @@
           #promote-milestone-modal
 
         - if @milestone.active?
-          = link_to 'Close milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-nr btn-grouped"
+          = link_to _('Close milestone'), project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: 'btn btn-close btn-nr btn-grouped'
         - else
-          = link_to 'Reopen milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-nr btn-grouped"
+          = link_to _('Reopen milestone'), project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: 'btn btn-reopen btn-nr btn-grouped'
 
         = render 'shared/milestones/delete_button'
 
-      %a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
+      %a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: '#' }
         = icon('angle-double-left')
 
   .detail-page-description.milestone-detail
@@ -62,10 +62,10 @@
 
   - if can?(current_user, :read_issue, @project) && @milestone.total_items_count(current_user).zero?
     .alert.alert-success.prepend-top-default
-      %span Assign some issues to this milestone.
+      %span= _('Assign some issues to this milestone.')
   - elsif @milestone.complete?(current_user) && @milestone.active?
     .alert.alert-success.prepend-top-default
-      %span All issues for this milestone are closed. You may close this milestone now.
+      %span= _('All issues for this milestone are closed. You may close this milestone now.')
 
   = render 'deprecation_message'
   = render 'shared/milestones/tabs', milestone: @milestone
diff --git a/changelogs/unreleased/gt-externalize-app-views-projects-milestones.yml b/changelogs/unreleased/gt-externalize-app-views-projects-milestones.yml
new file mode 100644
index 00000000000..56aaac812bb
--- /dev/null
+++ b/changelogs/unreleased/gt-externalize-app-views-projects-milestones.yml
@@ -0,0 +1,5 @@
+---
+title: Externalize strings from `/app/views/projects/milestones`
+merge_request: 24726
+author: George Tsiolis
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b910a85b702..d3ff3b1caa5 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -504,6 +504,9 @@ msgstr ""
 msgid "All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings."
 msgstr ""
 
+msgid "All issues for this milestone are closed. You may close this milestone now."
+msgstr ""
+
 msgid "All users"
 msgstr ""
 
@@ -765,6 +768,9 @@ msgstr ""
 msgid "Assign milestone"
 msgstr ""
 
+msgid "Assign some issues to this milestone."
+msgstr ""
+
 msgid "Assign to"
 msgstr ""
 
@@ -1494,6 +1500,9 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+msgid "Close milestone"
+msgstr ""
+
 msgid "Closed"
 msgstr ""
 
@@ -2297,6 +2306,9 @@ msgstr ""
 msgid "Create merge request and branch"
 msgstr ""
 
+msgid "Create milestone"
+msgstr ""
+
 msgid "Create new branch"
 msgstr ""
 
@@ -2758,6 +2770,9 @@ msgstr ""
 msgid "Edit Label"
 msgstr ""
 
+msgid "Edit Milestone"
+msgstr ""
+
 msgid "Edit Pipeline Schedule %{id}"
 msgstr ""
 
@@ -4587,6 +4602,9 @@ msgstr[1] ""
 msgid "New Label"
 msgstr ""
 
+msgid "New Milestone"
+msgstr ""
+
 msgid "New Pages Domain"
 msgstr ""
 
@@ -4629,6 +4647,9 @@ msgstr ""
 msgid "New merge request"
 msgstr ""
 
+msgid "New milestone"
+msgstr ""
+
 msgid "New pipelines will cancel older, pending pipelines on the same branch"
 msgstr ""
 
@@ -4710,6 +4731,9 @@ msgstr ""
 msgid "No messages were logged"
 msgstr ""
 
+msgid "No milestones to show"
+msgstr ""
+
 msgid "No other labels with such name or description"
 msgstr ""
 
@@ -4994,6 +5018,9 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+msgid "Past due"
+msgstr ""
+
 msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key."
 msgstr ""
 
@@ -5902,6 +5929,9 @@ msgstr ""
 msgid "Rename folder"
 msgstr ""
 
+msgid "Reopen milestone"
+msgstr ""
+
 msgid "Reply to this email directly or %{view_it_on_gitlab}."
 msgstr ""
 
@@ -8085,6 +8115,9 @@ msgstr ""
 msgid "Write a comment or drag your files here…"
 msgstr ""
 
+msgid "Write milestone description..."
+msgstr ""
+
 msgid "Yes"
 msgstr ""