Merge branch 'suzu-1990/gitlab-suzu-1990-master-patch-97784' into 'master'

Internationalize Admin Abuse Report

See merge request gitlab-org/gitlab!41355

app/views/admin/abuse_reports/_abuse_report.html.haml

@@ -2,33 +2,30 @@
 - user = abuse_report.user
 %tr
   %th.d-block.d-sm-none.d-md-none
-    %strong User
+    %strong= _('User')
   %td
     - if user
       = link_to user.name, user
       .light.small
-        Joined #{time_ago_with_tooltip(user.created_at)}
+        = _('Joined %{time_ago}').html_safe % { time_ago: time_ago_with_tooltip(user.created_at) }
     - else
-      (removed)
+      = _('(removed)')
   %td
-    %strong.subheading.d-block.d-sm-none.d-md-none Reported by
-    - if reporter
-      = link_to reporter.name, reporter
-    - else
-      (removed)
+    %strong.subheading.d-block.d-sm-none.d-md-none
+      = _('Reported by %{reporter}') % { reporter: reporter ? link_to(reporter.name, reporter) : _('(removed)') }
     .light.small
       = time_ago_with_tooltip(abuse_report.created_at)
   %td
-    %strong.subheading.d-block.d-sm-none.d-md-none Message
+    %strong.subheading.d-block.d-sm-none.d-md-none= _('Message')
     .message
       = markdown_field(abuse_report, :message)
   %td
     - if user
-      = link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true),
-        data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, remote: true, method: :delete, class: "btn btn-sm btn-block btn-remove js-remove-tr"
+      = link_to _('Remove user & report'), admin_abuse_report_path(abuse_report, remove_user: true),
+        data: { confirm: _("USER %{user} WILL BE REMOVED! Are you sure?") % { user: user.name } }, remote: true, method: :delete, class: "btn btn-sm btn-block btn-remove js-remove-tr"
     - if user && !user.blocked?
-      = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-sm btn-block"
+      = link_to _('Block user'), block_admin_user_path(user), data: {confirm: _('USER WILL BE BLOCKED! Are you sure?')}, method: :put, class: "btn btn-sm btn-block"
     - else
       .btn.btn-sm.disabled.btn-block
-        Already blocked
-    = link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-sm btn-block btn-close js-remove-tr"
+        = _('Already blocked')
+    = link_to _('Remove report'), [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-sm btn-block btn-close js-remove-tr"

changelogs/unreleased/suzu-1990-gitlab-suzu-1990-master-patch-97784.yml

+---
+title: Internationalize Admin Abuse Report
+merge_request: 41355
+author: suzu-1990
+type: other

locale/gitlab.pot

@@ -2510,6 +2510,9 @@ msgstr ""
 msgid "Almost there"
 msgstr ""
 
+msgid "Already blocked"
+msgstr ""
+
 msgid "Also called \"Issuer\" or \"Relying party trust identifier\""
 msgstr ""
 
@@ -3959,6 +3962,9 @@ msgstr ""
 msgid "Blame"
 msgstr ""
 
+msgid "Block user"
+msgstr ""
+
 msgid "Blocked"
 msgstr ""
 
@@ -14079,6 +14085,9 @@ msgstr ""
 msgid "Join Zoom meeting"
 msgstr ""
 
+msgid "Joined %{time_ago}"
+msgstr ""
+
 msgid "Jul"
 msgstr ""
 
@@ -15478,6 +15487,9 @@ msgstr ""
 msgid "Merging immediately isn't recommended as it may negatively impact the existing merge train. Read the %{docsLinkStart}documentation%{docsLinkEnd} for more information."
 msgstr ""
 
+msgid "Message"
+msgstr ""
+
 msgid "Messages"
 msgstr ""
 
@@ -20746,6 +20758,9 @@ msgstr ""
 msgid "Remove priority"
 msgstr ""
 
+msgid "Remove report"
+msgstr ""
+
 msgid "Remove secondary node"
 msgstr ""
 
@@ -20758,6 +20773,9 @@ msgstr ""
 msgid "Remove time estimate"
 msgstr ""
 
+msgid "Remove user & report"
+msgstr ""
+
 msgid "Removed"
 msgstr ""
 
@@ -20926,6 +20944,9 @@ msgstr ""
 msgid "Reported %{timeAgo} by %{reportedBy}"
 msgstr ""
 
+msgid "Reported by %{reporter}"
+msgstr ""
+
 msgid "Reporting"
 msgstr ""
 
@@ -26525,6 +26546,12 @@ msgstr ""
 msgid "URL or request ID"
 msgstr ""
 
+msgid "USER %{user} WILL BE REMOVED! Are you sure?"
+msgstr ""
+
+msgid "USER WILL BE BLOCKED! Are you sure?"
+msgstr ""
+
 msgid "UTC"
 msgstr ""