mastofe

commit: 1be48dd805fff44b953577cf7aa819d92a7c878e
parent: 6384041d17041ff0dcaf2d72a728df5999ceb4b1
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Fri,  9 Jun 2017 22:08:06 +0900

Refactor views/admin/reports/show.html.haml (#3656)


Diffstat:
M
app/views/admin/reports/show.html.haml
18
++++++++----------
M
config/locales/en.yml
1
+

2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
@@ -4,12 +4,12 @@
 .report-accounts
   .report-accounts__item
     %strong= t('admin.reports.reported_account')
-    = render partial: 'authorize_follows/card', locals: { account: @report.target_account }
-    = render partial: 'admin/accounts/card', locals: { account: @report.target_account }
+    = render 'authorize_follows/card', account: @report.target_account
+    = render 'admin/accounts/card', account: @report.target_account
   .report-accounts__item
     %strong= t('admin.reports.reported_by')
-    = render partial: 'authorize_follows/card', locals: { account: @report.account }
-    = render partial: 'admin/accounts/card', locals: { account: @report.account }
+    = render 'authorize_follows/card', account: @report.account
+    = render 'admin/accounts/card', account: @report.account
 
 %p
   %strong= t('admin.reports.comment.label')
@@ -22,7 +22,7 @@
   - @report.statuses.each do |status|
     .report-status
       .activity-stream.activity-stream-headless
-        .entry= render partial: 'stream_entries/simple_status', locals: { status: status }
+        .entry= render 'stream_entries/simple_status', status: status
       .report-status__actions
         - unless status.media_attachments.empty?
           = link_to admin_report_reported_status_path(@report, status, status: { sensitive: !status.sensitive }), method: :patch, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
@@ -30,9 +30,9 @@
         = link_to admin_report_reported_status_path(@report, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') } do
           = fa_icon 'trash'
 
-- if !@report.action_taken?
-  %hr/
+%hr/
 
+- if !@report.action_taken?
   %div{ style: 'overflow: hidden' }
     %div{ style: 'float: right' }
       = link_to t('admin.reports.silence_account'), admin_report_path(@report, outcome: 'silence'), method: :put, class: 'button'
@@ -40,8 +40,6 @@
     %div{ style: 'float: left' }
       = link_to t('admin.reports.mark_as_resolved'), admin_report_path(@report, outcome: 'resolve'), method: :put, class: 'button'
 - elsif !@report.action_taken_by_account.nil?
-  %hr/
-
   %p
-    %strong Action taken by:
+    %strong #{t('admin.reports.action_taken_by')}:
     = @report.action_taken_by_account.acct
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -140,6 +140,7 @@ en:
       domain_name: Domain
       title: Known Instances
     reports:
+      action_taken_by: Action taken by
       are_you_sure: Are you sure?
       comment:
         label: Comment