Merge branch...

Merge branch '22691-externalize-i18n-strings-from-./app/views/shared/issuable/_close_reopen_report_toggle.html.haml' into 'master'

Externalize i18n strings from ./app/views/shared/issuable/_close_reopen_report_toggle.html.haml

See merge request gitlab-org/gitlab!32168

app/views/shared/issuable/_close_reopen_report_toggle.html.haml

@@ -14,39 +14,37 @@
             method: button_method, class: "#{button_class} btn-#{button_action} #{(add_blocked_class ? 'btn-issue-blocked' : '')}", title: "#{display_button_action} #{display_issuable_type}", data: { qa_selector: 'close_issue_button' }
 
   = button_tag type: 'button', class: "#{toggle_class} btn-#{button_action}-color",
-               data: { 'dropdown-trigger' => '#issuable-close-menu' }, 'aria-label' => 'Toggle dropdown' do
+               data: { 'dropdown-trigger' => '#issuable-close-menu' }, 'aria-label' => _('Toggle dropdown') do
     = icon('caret-down', class: 'toggle-icon icon')
 
   %ul#issuable-close-menu.js-issuable-close-menu.dropdown-menu{ data: { dropdown: true } }
     %li.close-item{ class: "#{issuable_button_visibility(issuable, true) || 'droplab-item-selected'}",
-                    data: { text: "Close #{display_issuable_type}", url: close_issuable_path(issuable),
+                    data: { text: _("Close %{display_issuable_type}") % { display_issuable_type: display_issuable_type }, url: close_issuable_path(issuable),
                     button_class: "#{button_class} btn-close", toggle_class: "#{toggle_class} btn-close-color", method: button_method } }
       %button.btn.btn-transparent
         = icon('check', class: 'icon')
         .description
           %strong.title
-            Close
+            = _('Close')
             = display_issuable_type
 
     %li.reopen-item{ class: "#{issuable_button_visibility(issuable, false) || 'droplab-item-selected'}",
-                     data: { text: "Reopen #{display_issuable_type}", url: reopen_issuable_path(issuable),
+                     data: { text: _("Reopen %{display_issuable_type}") % { display_issuable_type: display_issuable_type }, url: reopen_issuable_path(issuable),
                      button_class: "#{button_class} btn-reopen", toggle_class: "#{toggle_class} btn-reopen-color", method: button_method } }
       %button.btn.btn-transparent
         = icon('check', class: 'icon')
         .description
           %strong.title
-            Reopen
+            = _('Reopen')
             = display_issuable_type
 
       %li.divider.droplab-item-ignore
 
-      %li.report-item{ data: { text: 'Report abuse', url: new_abuse_report_path(user_id: issuable.author.id, ref_url: issuable_url(issuable)),
+      %li.report-item{ data: { text: _('Report abuse'), url: new_abuse_report_path(user_id: issuable.author.id, ref_url: issuable_url(issuable)),
                        button_class: "#{button_class} btn-close-color", toggle_class: "#{toggle_class} btn-close-color", method: '' } }
         %button.btn.btn-transparent
           = icon('check', class: 'icon')
           .description
-            %strong.title Report abuse
+            %strong.title = _('Report abuse')
             %p.text
-              Report
-              = display_issuable_type.pluralize
-              that are abusive, inappropriate or spam.
+              = _('Report %{display_issuable_type} that are abusive, inappropriate or spam.') % { display_issuable_type: display_issuable_type.pluralize }

changelogs/unreleased/22691-externalize-i18n-strings-from---app-views-shared-issuable-_close_re.yml

+---
+title: Externalize i18n strings from ./app/views/shared/issuable/_close_reopen_report_toggle.html.haml
+merge_request: 32168
+author: Gilang Gumilar
+type: changed

locale/gitlab.pot

@@ -4358,6 +4358,9 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+msgid "Close %{display_issuable_type}"
+msgstr ""
+
 msgid "Close %{tabname}"
 msgstr ""
 
@@ -17711,6 +17714,9 @@ msgstr ""
 msgid "Reopen"
 msgstr ""
 
+msgid "Reopen %{display_issuable_type}"
+msgstr ""
+
 msgid "Reopen epic"
 msgstr ""
 
@@ -17759,9 +17765,15 @@ msgstr ""
 msgid "Repo by URL"
 msgstr ""
 
+msgid "Report %{display_issuable_type} that are abusive, inappropriate or spam."
+msgstr ""
+
 msgid "Report Type: %{report_type}"
 msgstr ""
 
+msgid "Report abuse"
+msgstr ""
+
 msgid "Report abuse to admin"
 msgstr ""
 
@@ -22488,6 +22500,9 @@ msgstr ""
 msgid "Toggle commit list"
 msgstr ""
 
+msgid "Toggle dropdown"
+msgstr ""
+
 msgid "Toggle emoji award"
 msgstr ""