From 64c251089d56c026976447a39c08f83fe9ceae95 Mon Sep 17 00:00:00 2001 From: Prakhar Pratyush Date: Mon, 6 May 2024 16:15:31 +0530 Subject: [PATCH] help: Update 'stream' to 'channel' in tab sections. --- help/configure-who-can-create-channels.md | 6 +++--- help/manage-user-channel-subscriptions.md | 4 ++-- help/mastering-the-compose-box.md | 2 +- help/set-default-channels-for-new-users.md | 4 ++-- help/view-channel-subscribers.md | 2 +- zerver/lib/markdown/help_settings_links.py | 6 +++--- zerver/lib/markdown/tabbed_sections.py | 10 +++++----- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/help/configure-who-can-create-channels.md b/help/configure-who-can-create-channels.md index cf0670f738..6d539544dc 100644 --- a/help/configure-who-can-create-channels.md +++ b/help/configure-who-can-create-channels.md @@ -20,7 +20,7 @@ unadvertised web-public channel in a legitimate organization. {start_tabs} -{tab|public-streams} +{tab|public-channels} {settings_tab|organization-permissions} @@ -28,7 +28,7 @@ unadvertised web-public channel in a legitimate organization. {!save-changes.md!} -{tab|private-streams} +{tab|private-channels} {settings_tab|organization-permissions} @@ -36,7 +36,7 @@ unadvertised web-public channel in a legitimate organization. {!save-changes.md!} -{tab|web-public-streams} +{tab|web-public-channels} {settings_tab|organization-permissions} diff --git a/help/manage-user-channel-subscriptions.md b/help/manage-user-channel-subscriptions.md index 9cadb2df88..b0ded53348 100644 --- a/help/manage-user-channel-subscriptions.md +++ b/help/manage-user-channel-subscriptions.md @@ -23,7 +23,7 @@ other users to a channel][configure-invites]. {start_tabs} -{tab|via-stream-settings} +{tab|via-channel-settings} {relative|channel|all} @@ -59,7 +59,7 @@ channel](/help/unsubscribe-from-a-channel). {start_tabs} -{tab|via-stream-settings} +{tab|via-channel-settings} {relative|channel|all} diff --git a/help/mastering-the-compose-box.md b/help/mastering-the-compose-box.md index 9bc5057d97..5929ee6fa3 100644 --- a/help/mastering-the-compose-box.md +++ b/help/mastering-the-compose-box.md @@ -17,7 +17,7 @@ will be sent. {start_tabs} -{tab|stream-compose} +{tab|channel-compose} {!start-composing.md!} diff --git a/help/set-default-channels-for-new-users.md b/help/set-default-channels-for-new-users.md index 3c256c2dfd..c52c36a58b 100644 --- a/help/set-default-channels-for-new-users.md +++ b/help/set-default-channels-for-new-users.md @@ -10,7 +10,7 @@ that default set. {start_tabs} -{settings_tab|default-streams-list} +{settings_tab|default-channels-list} 2. Under **Add new default channel**, enter the name of a channel. @@ -22,7 +22,7 @@ that default set. {start_tabs} -{settings_tab|default-streams-list} +{settings_tab|default-channels-list} 2. Find the channel you would like to remove, and click **Remove from default**. diff --git a/help/view-channel-subscribers.md b/help/view-channel-subscribers.md index 5bf8f6f2d5..1dc73b0614 100644 --- a/help/view-channel-subscribers.md +++ b/help/view-channel-subscribers.md @@ -10,7 +10,7 @@ unsubscribe other users to channels. {start_tabs} -{tab|via-stream-settings} +{tab|via-channel-settings} {relative|channel|all} diff --git a/zerver/lib/markdown/help_settings_links.py b/zerver/lib/markdown/help_settings_links.py index c6736cb3ca..e384d47f2a 100644 --- a/zerver/lib/markdown/help_settings_links.py +++ b/zerver/lib/markdown/help_settings_links.py @@ -69,10 +69,10 @@ link_mapping = { "Bots", "/#organization/bot-list-admin", ], - "default-streams-list": [ + "default-channels-list": [ "Organization settings", - "Default streams", - "/#organization/default-streams-list", + "Default channels", + "/#organization/default-channels-list", ], "linkifier-settings": [ "Organization settings", diff --git a/zerver/lib/markdown/tabbed_sections.py b/zerver/lib/markdown/tabbed_sections.py index ed3d93059b..b45f0f100d 100644 --- a/zerver/lib/markdown/tabbed_sections.py +++ b/zerver/lib/markdown/tabbed_sections.py @@ -79,14 +79,14 @@ TAB_SECTION_LABELS = { "via-left-sidebar": "Via left sidebar", "via-right-sidebar": "Via right sidebar", "instructions-for-all-platforms": "Instructions for all platforms", - "public-streams": "Public streams", - "private-streams": "Private streams", - "web-public-streams": "Web-public streams", + "public-channels": "Public channels", + "private-channels": "Private channels", + "web-public-channels": "Web-public channels", "via-user-card": "Via user card", "via-user-profile": "Via user profile", "via-organization-settings": "Via organization settings", "via-personal-settings": "Via personal settings", - "via-stream-settings": "Via stream settings", + "via-channel-settings": "Via channel settings", "default-subdomain": "Default subdomain", "custom-subdomain": "Custom subdomain", "zulip-cloud-standard": "Zulip Cloud Standard", @@ -110,7 +110,7 @@ TAB_SECTION_LABELS = { "via-drag-and-drop": "Via drag-and-drop", "via-markdown": "Via Markdown", "via-compose-box-buttons": "Via compose box button", - "stream-compose": "Compose to a stream", + "channel-compose": "Compose to a channel", "dm-compose": "Compose a DM", "v8": "Zulip Server 8.0+", "v6": "Zulip Server 6.0+",