diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index 69e9c02921e..9c7d13b58a9 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -29,6 +29,9 @@ - if @report.comment.present? = 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/ %h3 diff --git a/config/locales/en.yml b/config/locales/en.yml index 1df9af88d95..c8234ebd156 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -645,6 +645,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