From d90d23699ca611f05d8def40109505251507fa46 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 12 Apr 2017 17:11:49 +0200 Subject: Make Reporting admin section translatable (#1549) * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel --- app/views/admin/reports/show.html.haml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'app/views/admin/reports/show.html.haml') diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index caa8415df..1143c2c2e 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -1,18 +1,19 @@ - content_for :page_title do - = "Report ##{@report.id}" + = t('reports.report', id: @report.id) .report-accounts .report-accounts__item - %strong Reported account: + %strong= t('reports.reported_account') = render partial: 'authorize_follow/card', locals: { account: @report.target_account } .report-accounts__item - %strong Reported by: + %strong= t('reports.reported_by') = render partial: 'authorize_follow/card', locals: { account: @report.account } %p - %strong Comment: + %strong= t('reports.comment.label') + \: - if @report.comment.blank? - None + = t('reports.comment.none') - else = @report.comment @@ -24,7 +25,7 @@ .activity-stream.activity-stream-headless .entry= render partial: 'stream_entries/simple_status', locals: { status: status } .report-status__actions - = link_to remove_admin_report_path(@report, status_id: status.id), method: :post, class: 'icon-button', style: 'font-size: 24px; width: 24px; height: 24px', title: 'Delete' do + = link_to remove_admin_report_path(@report, status_id: status.id), method: :post, class: 'icon-button', style: 'font-size: 24px; width: 24px; height: 24px', title: t('reports.delete') do = fa_icon 'trash' - if !@report.action_taken? @@ -32,10 +33,10 @@ %div{ style: 'overflow: hidden' } %div{ style: 'float: right' } - = link_to 'Silence account', silence_admin_report_path(@report), method: :post, class: 'button' - = link_to 'Suspend account', suspend_admin_report_path(@report), method: :post, class: 'button' + = link_to t('reports.silence_account'), silence_admin_report_path(@report), method: :post, class: 'button' + = link_to t('reports.suspend_account'), suspend_admin_report_path(@report), method: :post, class: 'button' %div{ style: 'float: left' } - = link_to 'Mark as resolved', resolve_admin_report_path(@report), method: :post, class: 'button' + = link_to t('reports.mark_as_resolved'), resolve_admin_report_path(@report), method: :post, class: 'button' - elsif !@report.action_taken_by_account.nil? %hr/ -- cgit