Merge branch...

Merge branch '22691-externelize-i18n-strings-from-./app/views/shared/_delete_label_modal.html.haml' into 'master'

Externalize i18n strings from ./app/views/shared/_delete_label_modal.html.haml

See merge request gitlab-org/gitlab!32138

app/views/shared/_delete_label_modal.html.haml

@@ -2,20 +2,19 @@
   .modal-dialog
     .modal-content
       .modal-header
-        %h3.page-title Delete label: #{label.name} ?
+        %h3.page-title= _('Delete label: %{label_name} ?') % { label_name: label.name }
         %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
           %span{ "aria-hidden": true } ×
 
       .modal-body
         %p
-          %strong= label.name
-          %span will be permanently deleted from #{label.subject_name}. This cannot be undone.
+          = _('<strong>%{label_name}</strong> <span>will be permanently deleted from %{subject_name}. This cannot be undone.</span>').html_safe % { label_name: label.name, subject_name: label.subject_name }
 
       .modal-footer
-        %a{ href: '#', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel
+        %a{ href: '#', data: { dismiss: 'modal' }, class: 'btn btn-default' }= _('Cancel')
 
-        = link_to 'Delete label',
+        = link_to _('Delete label'),
           label.destroy_path,
-          title: 'Delete',
+          title: _('Delete'),
           method: :delete,
           class: 'btn btn-remove'

changelogs/unreleased/22691-externelize-i18n-strings-from---app-views-shared-_delete_label_moda.yml

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

locale/gitlab.pot

@@ -829,6 +829,9 @@ msgstr ""
 msgid "<strong>%{group_name}</strong> group members"
 msgstr ""
 
+msgid "<strong>%{label_name}</strong> <span>will be permanently deleted from %{subject_name}. This cannot be undone.</span>"
+msgstr ""
+
 msgid "<strong>Deletes</strong> source branch"
 msgstr ""
 
@@ -6926,6 +6929,12 @@ msgstr ""
 msgid "Delete domain"
 msgstr ""
 
+msgid "Delete label"
+msgstr ""
+
+msgid "Delete label: %{label_name} ?"
+msgstr ""
+
 msgid "Delete license"
 msgstr ""