tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Reporting admin section translatable (#1549)

Browse Source 
* Make Reporting admin section translatable

And translate it into english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Make subject of emails translatable and improve french translation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Make error pages translatable and translate them in english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Translate site setting section

* Insert instance in registration emails and improve them a bit

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2017-04-12 17:11:49 +02:00
committed by Eugen
parent 1f5ff46fd9
commit d90d23699c
15 changed files with 192 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/admin/reports/show.html.haml
View File

@ -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/