Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: enable_auto_join_users was used in create channel (#19128) 

7e39a21de1
broke the explanation of the check box on `create-channel` view.

Actions:
- uses core yes_value/no_value
- re-add the correct translation for `enable_auto_join_users`
- removes `disable_auto_join_users` which is not used anymore
This commit is contained in:
Joffrey JAFFEUX 2022-11-21 14:28:11 +01:00 committed by GitHub
parent ecce3c81f2
commit 5573257158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js
View File

@ -19,8 +19,8 @@ const MUTED_OPTIONS = [
]; ];
const AUTO_ADD_USERS_OPTIONS = [ const AUTO_ADD_USERS_OPTIONS = [
{ name: I18n.t("chat.settings.enable_auto_join_users"), value: true }, { name: I18n.t("yes_value"), value: true },
{ name: I18n.t("chat.settings.disable_auto_join_users"), value: false }, { name: I18n.t("no_value"), value: false },
]; ];
export default class ChatChannelSettingsView extends Component { export default class ChatChannelSettingsView extends Component {

3
plugins/chat/config/locales/client.en.yml
View File

@ -291,8 +291,7 @@ en:
settings: settings:
auto_join_users_label: "Automatically add users" auto_join_users_label: "Automatically add users"
auto_join_users_info: "Check hourly which users have been active in the last 3 months and, if they have access to the %{category} category, add them to this channel." auto_join_users_info: "Check hourly which users have been active in the last 3 months and, if they have access to the %{category} category, add them to this channel."
enable_auto_join_users: "Yes" enable_auto_join_users: "Automatically add all recently active users"
disable_auto_join_users: "No"
auto_join_users_warning: "Every user who isn't a member of this channel and has access to the %{category} category will join. Are you sure?" auto_join_users_warning: "Every user who isn't a member of this channel and has access to the %{category} category will join. Are you sure?"
desktop_notification_level: "Desktop notifications" desktop_notification_level: "Desktop notifications"
follow: "Join" follow: "Join"