summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lbennett@gitlab.com>2019-01-28 04:16:50 +0000
committerLuke Bennett <lbennett@gitlab.com>2019-01-28 05:04:15 +0000
commitdd491367e2eeca29424f405d7ca1ecf9febeba4a (patch)
tree4874e8f7bcc2d803d1ecd3b32c8cc8c86bf29a42
parentc243b154abf5c29ba35fd2fab2ca3bc010fdc324 (diff)
downloadgitlab-ce-abuse-ext.tar.gz
Externalize admin abuse reports stringsabuse-ext
-rw-r--r--app/views/admin/abuse_reports/_abuse_report.html.haml22
-rw-r--r--app/views/admin/abuse_reports/index.html.haml16
-rw-r--r--changelogs/unreleased/abuse-ext.yml5
-rw-r--r--locale/gitlab.pot39
4 files changed, 64 insertions, 18 deletions
diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml
index 89a87f38968..97045f9f0f3 100644
--- a/app/views/admin/abuse_reports/_abuse_report.html.haml
+++ b/app/views/admin/abuse_reports/_abuse_report.html.haml
@@ -2,33 +2,33 @@
- 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 %{created_at_timeago}').html_safe % { created_at_timeago: time_ago_with_tooltip(user.created_at) }
- else
- (removed)
+ = _('(removed)')
%td
- %strong.subheading.d-block.d-sm-none.d-md-none Reported by
+ %strong.subheading.d-block.d-sm-none.d-md-none= _('Reported by')
- if reporter
= link_to reporter.name, reporter
- else
- (removed)
+ = _('(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 %{username} WILL BE REMOVED! Are you sure?') % { username: 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"
diff --git a/app/views/admin/abuse_reports/index.html.haml b/app/views/admin/abuse_reports/index.html.haml
index cc29657a439..01128c4ac8d 100644
--- a/app/views/admin/abuse_reports/index.html.haml
+++ b/app/views/admin/abuse_reports/index.html.haml
@@ -1,5 +1,5 @@
-- page_title 'Abuse Reports'
-%h3.page-title Abuse Reports
+- page_title _('Abuse Reports')
+%h3.page-title= _('Abuse Reports')
%hr
.abuse-reports
- if @abuse_reports.present?
@@ -7,13 +7,15 @@
%table.table.responsive-table
%thead.d-none.d-sm-none.d-md-table-header-group
%tr
- %th User
- %th Reported by
- %th.wide Message
- %th Action
+ %th= _('User')
+ %th= _('Reported by')
+ %th.wide= _('Message')
+ %th= _('Action')
= render @abuse_reports
= paginate @abuse_reports, theme: 'gitlab'
- else
.empty-state
.text-center
- %h4 There are no abuse reports! #{emoji_icon('tada')}
+ %h4
+ = _('There are no abuse reports!')
+ = emoji_icon('tada')
diff --git a/changelogs/unreleased/abuse-ext.yml b/changelogs/unreleased/abuse-ext.yml
new file mode 100644
index 00000000000..2caf3ad3a9d
--- /dev/null
+++ b/changelogs/unreleased/abuse-ext.yml
@@ -0,0 +1,5 @@
+---
+title: Externalize admin abuse reports strings
+merge_request:
+author:
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a72e921dcce..f7a2b09bf42 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -191,6 +191,9 @@ msgstr ""
msgid "(external source)"
msgstr ""
+msgid "(removed)"
+msgstr ""
+
msgid "+ %{count} more"
msgstr ""
@@ -357,6 +360,9 @@ msgstr ""
msgid "Account and limit"
msgstr ""
+msgid "Action"
+msgstr ""
+
msgid "Active"
msgstr ""
@@ -531,6 +537,9 @@ msgstr ""
msgid "Allows you to add and manage Kubernetes clusters."
msgstr ""
+msgid "Already blocked"
+msgstr ""
+
msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import."
msgstr ""
@@ -1002,6 +1011,9 @@ msgstr ""
msgid "Bitbucket import"
msgstr ""
+msgid "Block user"
+msgstr ""
+
msgid "Blocked"
msgstr ""
@@ -3930,6 +3942,9 @@ msgstr ""
msgid "Job|This job is stuck because the project doesn't have any runners online assigned to it."
msgstr ""
+msgid "Joined %{created_at_timeago}"
+msgstr ""
+
msgid "Jul"
msgstr ""
@@ -4330,6 +4345,9 @@ msgstr ""
msgid "Merged"
msgstr ""
+msgid "Message"
+msgstr ""
+
msgid "Messages"
msgstr ""
@@ -5800,6 +5818,12 @@ msgstr ""
msgid "Remove project"
msgstr ""
+msgid "Remove report"
+msgstr ""
+
+msgid "Remove user & report"
+msgstr ""
+
msgid "Removed group can not be restored!"
msgstr ""
@@ -5821,6 +5845,9 @@ msgstr ""
msgid "Report abuse to GitLab"
msgstr ""
+msgid "Reported by"
+msgstr ""
+
msgid "Reporting"
msgstr ""
@@ -6938,6 +6965,9 @@ msgstr ""
msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
msgstr ""
+msgid "There are no abuse reports!"
+msgstr ""
+
msgid "There are no archived projects yet"
msgstr ""
@@ -7509,6 +7539,12 @@ msgstr ""
msgid "Type"
msgstr ""
+msgid "USER %{username} WILL BE REMOVED! Are you sure?"
+msgstr ""
+
+msgid "USER WILL BE BLOCKED! Are you sure?"
+msgstr ""
+
msgid "Unable to load the diff. %{button_try_again}"
msgstr ""
@@ -7629,6 +7665,9 @@ msgstr ""
msgid "Use your global notification setting"
msgstr ""
+msgid "User"
+msgstr ""
+
msgid "User Cohorts are only shown when the %{usage_ping_link_start}usage ping%{usage_ping_link_end} is enabled."
msgstr ""