From 71342169fff0c85cbd9f66c055a1f9a28eae4d3f Mon Sep 17 00:00:00 2001
From: Vector73 <v.shm.kunal@gmail.com>
Date: Fri, 11 Jul 2025 14:01:14 +0000
Subject: [PATCH] stream_settings: Update organization default dropdown labels.

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

Fixes #35212.
---
 web/src/settings_config.ts                           | 8 +++++++-
 web/templates/stream_settings/stream_permissions.hbs | 2 +-
 web/tests/compose.test.cjs                           | 2 +-
 web/tests/compose_ui.test.cjs                        | 2 +-
 web/tests/compose_validate.test.cjs                  | 5 ++++-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/web/src/settings_config.ts b/web/src/settings_config.ts
index e8fa7f71f0..310733a0c9 100644
--- a/web/src/settings_config.ts
+++ b/web/src/settings_config.ts
@@ -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: {
diff --git a/web/templates/stream_settings/stream_permissions.hbs b/web/templates/stream_settings/stream_permissions.hbs
index 7c74d34486..d587dee34d 100644
--- a/web/templates/stream_settings/stream_permissions.hbs
+++ b/web/templates/stream_settings/stream_permissions.hbs
@@ -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>
diff --git a/web/tests/compose.test.cjs b/web/tests/compose.test.cjs
index 48a1d9757d..ab668ff1b2 100644
--- a/web/tests/compose.test.cjs
+++ b/web/tests/compose.test.cjs
@@ -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);
diff --git a/web/tests/compose_ui.test.cjs b/web/tests/compose_ui.test.cjs
index 9e8ec355e0..cf770d0761 100644
--- a/web/tests/compose_ui.test.cjs
+++ b/web/tests/compose_ui.test.cjs
@@ -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: {}});
 
diff --git a/web/tests/compose_validate.test.cjs b/web/tests/compose_validate.test.cjs
index 844317c278..5368f608e8 100644
--- a/web/tests/compose_validate.test.cjs
+++ b/web/tests/compose_validate.test.cjs
@@ -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);