Merge branch 'dblessing_merge_request_i18n_strings' into 'master'

Ensure merge request header strings are internationalized

See merge request gitlab-org/gitlab!71093

app/views/projects/merge_requests/_mr_title.html.haml

@@ -32,20 +32,20 @@
         .dropdown-menu.dropdown-menu-right
           %ul
             - if can_update_merge_request
-              %li= link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
+              %li= link_to _('Edit'), edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
               - if @merge_request.opened?
                 %li
                   = link_to @merge_request.work_in_progress? ? _('Mark as ready') : _('Mark as draft'), toggle_draft_merge_request_path(@merge_request), method: :put, class: "js-draft-toggle-button"
               %li{ class: [merge_request_button_visibility(@merge_request, true), 'js-close-item'] }
-                = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, title: 'Close merge request'
+                = link_to _('Close'), merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, title: 'Close merge request'
             - if can_reopen_merge_request
               %li{ class: merge_request_button_visibility(@merge_request, false) }
-                = link_to 'Reopen', merge_request_path(@merge_request, merge_request: { state_event: :reopen }), method: :put, title: 'Reopen merge request'
+                = link_to _('Reopen'), merge_request_path(@merge_request, merge_request: { state_event: :reopen }), method: :put, title: 'Reopen merge request'
             - unless @merge_request.merged? || current_user == @merge_request.author
-              %li= link_to 'Report abuse', new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request))
+              %li= link_to _('Report abuse'), new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request))
 
         - if can_update_merge_request
-          = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: "d-none d-md-block btn gl-button btn-default btn-grouped js-issuable-edit", data: { qa_selector: "edit_button" }
+          = link_to _('Edit'), edit_project_merge_request_path(@project, @merge_request), class: "d-none d-md-block btn gl-button btn-default btn-grouped js-issuable-edit", data: { qa_selector: "edit_button" }
 
         - if can_update_merge_request && !are_close_and_open_buttons_hidden
           = render 'projects/merge_requests/close_reopen_draft_report_toggle'

app/views/projects/merge_requests/_nav_btns.html.haml

@@ -5,7 +5,7 @@
 .js-csv-import-export-buttons{ data: { show_export_button: "true", issuable_type: issuable_type, issuable_count: issuables_count_for_state(issuable_type.to_sym, params[:state]), email: notification_email, export_csv_path: export_csv_project_merge_requests_path(@project, request.query_parameters), container_class: 'gl-mr-3' } }
 
 - if @can_bulk_update
-  = button_tag "Edit merge requests", class: "gl-button btn btn-default gl-mr-3 js-bulk-update-toggle"
+  = button_tag _("Edit merge requests"), class: "gl-button btn btn-default gl-mr-3 js-bulk-update-toggle"
 - if merge_project
-  = link_to new_merge_request_path, class: "gl-button btn btn-confirm", title: "New merge request" do
-    New merge request
+  = link_to new_merge_request_path, class: "gl-button btn btn-confirm", title: _("New merge request") do
+    = _('New merge request')

locale/gitlab.pot

@@ -12337,6 +12337,9 @@ msgstr ""
 msgid "Edit issues"
 msgstr ""
 
+msgid "Edit merge requests"
+msgstr ""
+
 msgid "Edit public deploy key"
 msgstr ""