paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_settings: Update organization default dropdown labels.

Browse Source 
Updates labels for organization default options in "topics policy"
and "message retention policy" channel settings.

Fixes #35212.
This commit is contained in:
Vector73
2025-07-11 14:01:14 +00:00
committed by Tim Abbott
parent 99b97ea883
commit 71342169ff
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/settings_config.ts
View File

@@ -334,7 +334,13 @@ export const get_stream_topics_policy_values = (): StreamTopicsPolicyValues => {
return {
inherit: {
code: "inherit",
description: $t({defaultMessage: "Organization default"}),
description: $t(
{defaultMessage: "Organization default ({org_level_topics_policy})"},
{
org_level_topics_policy:
realm_topics_policy_values[realm.realm_topics_policy].description,
},
),
},
...realm_topics_policy_values,
empty_topic_only: {

2
web/templates/stream_settings/stream_permissions.hbs
View File

@@ -185,7 +185,7 @@
class="stream_message_retention_setting prop-element settings_select bootstrap-focus-style"
id="{{prefix}}message_retention_days"
data-setting-widget-type="message-retention-setting">
<option value="realm_default">{{t "Use organization level settings {org_level_message_retention_setting}" }}</option>
<option value="realm_default">{{t "Organization default {org_level_message_retention_setting}" }}</option>
<option value="unlimited">{{t 'Retain forever' }}</option>
<option value="custom_period">{{t 'Custom' }}</option>
</select>

2
web/tests/compose.test.cjs
View File

@@ -67,7 +67,7 @@ const stream_data = zrequire("stream_data");
const compose_validate = zrequire("compose_validate");
const {initialize_user_settings} = zrequire("user_settings");
const realm = {};
const realm = {realm_topics_policy: "allow_empty_topic"};
set_realm(realm);
const current_user = {};
set_current_user(current_user);

2
web/tests/compose_ui.test.cjs
View File

@@ -30,7 +30,7 @@ const text_field_edit = mock_esm("text-field-edit");
const {set_realm} = zrequire("state_data");
const {initialize_user_settings} = zrequire("user_settings");
const realm = {};
const realm = {realm_topics_policy: "allow_empty_topic"};
set_realm(realm);
initialize_user_settings({user_settings: {}});

5
web/tests/compose_validate.test.cjs
View File

@@ -36,7 +36,10 @@ mock_esm("../src/group_permission_settings", {
});
const REALM_EMPTY_TOPIC_DISPLAY_NAME = "general chat";
const realm = {realm_empty_topic_display_name: REALM_EMPTY_TOPIC_DISPLAY_NAME};
const realm = {
realm_empty_topic_display_name: REALM_EMPTY_TOPIC_DISPLAY_NAME,
realm_topics_policy: "allow_empty_topic",
};
set_realm(realm);
const current_user = {};
set_current_user(current_user);