gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-07 20:26:15 +00:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Merge ec2ce1a822 into fbe9728f36

Browse Source
This commit is contained in:
Emelia Smith 2025-05-06 15:03:45 +00:00 committed by GitHub
commit b2afdd8806
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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?
= render 'admin/reports/comment', report: @report
- if @report.account.local? && !@statuses.empty? && (@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/
%h3

1
config/locales/en.yml
View File

@ -694,6 +694,7 @@ en:
reported_with_application: Reported with application
resolved: 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
status: Status
statuses: Reported content