OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-23 04:02:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add warning in reports if the local reporting user has disabled hiding of sensitive media

Browse source 
Fixes #29291
This commit is contained in:
Emelia Smith 2024-08-17 21:09:43 +02:00
parent 2d589a5ed4
commit 2459190a5e
No known key found for this signature in database
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,9 @@
- if @report.comment.present? - if @report.comment.present?
= render 'admin/reports/comment', report: @report = render 'admin/reports/comment', report: @report
- if @report.account.local? && (@report.account.user.settings['web.expand_content_warnings'] || @report.account.user.settings['web.display_media'] == 'show_all')
.flash-message.warning= t('admin.reports.sensitive_media_explanation')
%hr.spacer/ %hr.spacer/
%h3 %h3

1
config/locales/en.yml
View file

@ -645,6 +645,7 @@ en:
reported_with_application: Reported with application reported_with_application: Reported with application
resolved: Resolved resolved: Resolved
resolved_msg: Report successfully resolved! resolved_msg: Report successfully resolved!
sensitive_media_explanation: The reporting user has content warnings disabled or has chosen to always shows media, even if it contains sensitive content.
skip_to_actions: Skip to actions skip_to_actions: Skip to actions
status: Status status: Status
statuses: Reported content statuses: Reported content