diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs index eaf5f160848..33adba35aba 100644 --- a/app/assets/javascripts/discourse/templates/modal/flag.hbs +++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs @@ -30,4 +30,5 @@ {{#if canDeleteSpammer}} {{/if}} + {{{i18n flagging.private_reminder}}} diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 5724c8afe86..6c4c138963e 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -56,6 +56,13 @@ animation: modal .25s; .modal-footer .btn-group .btn + .btn { margin-left: -1px; } + +.modal-footer span.hint { + color: scale-color($primary, $lightness: 70%); + float: right; + line-height: 30px; +} + .modal-header { border-bottom: 1px solid scale-color-diff(); h3 { diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index bfacdb308b4..35ab71126df 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -48,6 +48,9 @@ .modal-footer .btn-group .btn + .btn { margin-left: -1px; } + +.modal-footer span.hint { display: none; } + .modal-header { // we need tighter spacing on mobile for header // this clearfix under the modal title h3 pushes it way down diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 5b82f54c7c7..10c5cbe1a2f 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1313,6 +1313,7 @@ en: flagging: title: 'Thank you for helping to keep our community civil!' + private_reminder: 'flags are private, only visible to staff' action: 'Flag Post' take_action: "Take Action" notify_action: 'Private message' @@ -1336,7 +1337,7 @@ en: left: "{{n}} remaining" flagging_topic: - title: "Why are you privately flagging this topic?" + title: "Thank you for helping to keep our community civil!" action: "Flag Topic" notify_action: "Private message"