mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add banner for forwarded reports made by remote users about remote content (#27549)

pull/2527/head
Claire 2023-11-15 15:18:43 +01:00 committed by GitHub
parent 12a5b7391d
commit bd575a1dd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/reports/_header_details.html.haml
View File

@ -22,7 +22,7 @@
= t('admin.reports.resolved') = t('admin.reports.resolved')
- else - else
= t('admin.reports.unresolved') = t('admin.reports.unresolved')
- unless report.target_account.local? - if report.account.local? && !report.target_account.local?
.report-header__details__item .report-header__details__item
.report-header__details__item__header .report-header__details__item__header
%strong= t('admin.reports.forwarded') %strong= t('admin.reports.forwarded')

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

@ -7,6 +7,9 @@
- else - else
= link_to t('admin.reports.mark_as_unresolved'), reopen_admin_report_path(@report), method: :post, class: 'button' = link_to t('admin.reports.mark_as_unresolved'), reopen_admin_report_path(@report), method: :post, class: 'button'
- unless @report.account.local? || @report.target_account.local?
.flash-message= t('admin.reports.forwarded_replies_explanation')
.report-header .report-header
= render 'admin/reports/header_card', report: @report = render 'admin/reports/header_card', report: @report
= render 'admin/reports/header_details', report: @report = render 'admin/reports/header_details', report: @report

1
config/locales/en.yml
View File

@ -611,6 +611,7 @@ en:
created_at: Reported created_at: Reported
delete_and_resolve: Delete posts delete_and_resolve: Delete posts
forwarded: Forwarded forwarded: Forwarded
forwarded_replies_explanation: This report is from a remote user and about remote content. It has been forwarded to you because the reported content is in reply to one of your users.
forwarded_to: Forwarded to %{domain} forwarded_to: Forwarded to %{domain}
mark_as_resolved: Mark as resolved mark_as_resolved: Mark as resolved
mark_as_sensitive: Mark as sensitive mark_as_sensitive: Mark as sensitive