A platform for community discussion. Free, open, simple.
UX: clarify that silence reasons will be public when relevant (#45140)
Krisc6a37517cc3b
diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 60fd48e34ab..8fe56d5bb79 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -10060,7 +10060,9 @@ en:silenced_by: "Silenced By"silence_modal_title: "Silence User"silence_duration: "How long will the user be silenced for?"- silence_reason_label: "Why are you silencing this user?"+ silence_reason_label: "Why are you silencing? This text <b>will be visible to everyone</b> on this user's profile page. Keep it short."+ silence_reason_hidden_label: "Why are you silencing? This text will only be visible to staff and this user. Keep it short."+ silence_reason_title: "Silence reason"silence_reason_placeholder: "Silence Reason"silence_message: "Email Message"silence_message_placeholder: "(leave blank to send default message)"diff --git a/frontend/discourse/admin/components/admin-penalty-reason.gjs b/frontend/discourse/admin/components/admin-penalty-reason.gjsindex da7c74834d3..8324151c871 100644--- a/frontend/discourse/admin/components/admin-penalty-reason.gjs+++ b/frontend/discourse/admin/components/admin-penalty-reason.gjs@@ -2,7 +2,6 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import { trustHTML } from "@ember/template";import withEventValue from "discourse/helpers/with-event-value";import ComboBox from "discourse/select-kit/components/combo-box";import DTextField from "discourse/ui-kit/d-text-field";@@ -73,8 +72,9 @@ export default class AdminPenaltyReason extends Component {/>{{/if}}{{else if (eq @penaltyType "silence")}}- <label class="silence-reason-title">- {{trustHTML (i18n "admin.user.silence_reason_label")}}</label>+ <label class="silence-reason-title">{{i18n+ "admin.user.silence_reason_title"+ }}</label><ComboBoxclass="silence-reason"diff --git a/frontend/discourse/admin/components/modal/penalize-user.gjs b/frontend/discourse/admin/components/modal/penalize-user.gjsindex 29a95e26f5a..5e9d9ae23ca 100644--- a/frontend/discourse/admin/components/modal/penalize-user.gjs+++ b/frontend/discourse/admin/components/modal/penalize-user.gjs@@ -194,6 +194,14 @@ export default class PenalizeUser extends Component {{{trustHTML (i18n "admin.user.suspend_reason_label")}}{{/if}}</div>+ {{else if (eq @model.penaltyType "silence")}}+ <div class="penalty-reason-visibility">+ {{#if this.siteSettings.hide_silencing_reasons}}+ {{trustHTML (i18n "admin.user.silence_reason_hidden_label")}}+ {{else}}+ {{trustHTML (i18n "admin.user.silence_reason_label")}}+ {{/if}}+ </div>{{/if}}<AdminPenaltyReason@message={{this.message}}diff --git a/frontend/discourse/admin/components/silence-details.gjs b/frontend/discourse/admin/components/silence-details.gjsindex 65882221115..c974dac31c8 100644--- a/frontend/discourse/admin/components/silence-details.gjs+++ b/frontend/discourse/admin/components/silence-details.gjs@@ -1,6 +1,5 @@/* eslint-disable ember/no-classic-components */import Component, { Textarea } from "@ember/component";-import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@@ -11,7 +10,7 @@ export default class SilenceDetails extends Component {<div class="penalty-reason-controls"><label><div class="silence-reason-label">- {{trustHTML (i18n "admin.user.silence_reason_label")}}+ {{i18n "admin.user.silence_reason_title"}}</div></label><DTextField