From b28a854acc19da1c1a8d88623f4c6118c8897a26 Mon Sep 17 00:00:00 2001 From: Kislay Verma Date: Thu, 16 May 2024 21:00:57 +0530 Subject: [PATCH] left_sidebar: Rename "more topics" to "all topics". This commit renames the occurrences of "more topics" to "all topics" in comments and documentation. Fixes #30014 --- help/include/left-sidebar-conversations.md | 2 +- tools/lib/capitalization.py | 2 +- web/src/topic_list_data.ts | 4 ++-- web/templates/more_topics.hbs | 2 +- web/tests/topic_list_data.test.js | 2 +- zerver/models/streams.py | 2 +- zerver/openapi/zulip.yaml | 4 ++-- zilencer/management/commands/populate_db.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/help/include/left-sidebar-conversations.md b/help/include/left-sidebar-conversations.md index 374593e5c5c53d..2de5f6fc06343f 100644 --- a/help/include/left-sidebar-conversations.md +++ b/help/include/left-sidebar-conversations.md @@ -12,7 +12,7 @@ and the channels you are subscribed to. !!! tip "" - To see all conversations, click on **more conversations** (in direct messages) or **more topics** + To see all conversations, click on **more conversations** (in direct messages) or **all topics** (in a channel). {end_tabs} diff --git a/tools/lib/capitalization.py b/tools/lib/capitalization.py index 03917d1e7579db..736e74f5210165 100644 --- a/tools/lib/capitalization.py +++ b/tools/lib/capitalization.py @@ -91,7 +91,7 @@ r"find accounts for another email address", # SPECIAL CASES # Because topics usually are lower-case, this would look weird if it were capitalized - r"more topics", + r"all topics", # Used alone in a parenthetical where capitalized looks worse. r"^deprecated$", # We want the similar text in the Private Messages section to have the same capitalization. diff --git a/web/src/topic_list_data.ts b/web/src/topic_list_data.ts index abf7e4be8eb9e2..5498c5cf44b878 100644 --- a/web/src/topic_list_data.ts +++ b/web/src/topic_list_data.ts @@ -98,7 +98,7 @@ function choose_topics( // Otherwise, we don't show the topic in the // unzoomed view. We might display its unread - // count in in "more topics" if it is not muted. + // count in in "all topics" if it is not muted. return false; } @@ -203,7 +203,7 @@ export function get_list_info( stream_muted ) { // For muted streams, if the only unreads are in muted topics, - // we have a muted styling "more topics" row. + // we have a muted styling "all topics" row. return { items: topic_choice_state.items, num_possible_topics: topic_names.length, diff --git a/web/templates/more_topics.hbs b/web/templates/more_topics.hbs index b639a466f9aad4..6cce5f73f236ec 100644 --- a/web/templates/more_topics.hbs +++ b/web/templates/more_topics.hbs @@ -2,7 +2,7 @@ {{#unless more_topics_unreads}}zero-topic-unreads{{/unless}} {{#if more_topics_unread_count_muted}}more_topic_unreads_muted_only{{/if}}">
- {{t "more topics" }} + {{t "all topics" }}
{{#if more_topics_have_unread_mention_messages}} diff --git a/web/tests/topic_list_data.test.js b/web/tests/topic_list_data.test.js index 4d96ecfb7c8483..7e9b9ce4f27e1e 100644 --- a/web/tests/topic_list_data.test.js +++ b/web/tests/topic_list_data.test.js @@ -326,7 +326,7 @@ test("get_list_info unreads", ({override}) => { list_info = get_list_info(); assert.equal(list_info.items.length, 12); assert.equal(list_info.more_topics_unreads, 3); - // Topic 14 now makes it above the "more topics" fold. + // Topic 14 now makes it above the "all topics" fold. assert.equal(list_info.more_topics_have_unread_mention_messages, false); assert.equal(list_info.num_possible_topics, 16); assert.equal(list_info.more_topics_unread_count_muted, true); diff --git a/zerver/models/streams.py b/zerver/models/streams.py index 34b4f067ffa423..89e6a284d9651b 100644 --- a/zerver/models/streams.py +++ b/zerver/models/streams.py @@ -137,7 +137,7 @@ class Stream(models.Model): can_remove_subscribers_group = models.ForeignKey(UserGroup, on_delete=models.RESTRICT) # The very first message ID in the stream. Used to help clients - # determine whether they might need to display "more topics" for a + # determine whether they might need to display "all topics" for a # stream based on what messages they have cached. first_message_id = models.IntegerField(null=True, db_index=True) diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 7c13fd81331339..0569e47ef866df 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -19374,7 +19374,7 @@ components: The ID of the first message in the stream. Intended to help clients determine whether they need to display - UI like the "more topics" widget that would suggest the stream + UI like the "all topics" widget that would suggest the stream has older history that can be accessed. Is `null` for streams with no message history. @@ -20247,7 +20247,7 @@ components: The ID of the first message in the stream. Intended to help clients determine whether they need to display - UI like the "more topics" widget that would suggest the stream + UI like the "all topics" widget that would suggest the stream has older history that can be accessed. Is `null` for streams with no message history. diff --git a/zilencer/management/commands/populate_db.py b/zilencer/management/commands/populate_db.py index 60dea60d85dd28..1866583f065adb 100644 --- a/zilencer/management/commands/populate_db.py +++ b/zilencer/management/commands/populate_db.py @@ -317,7 +317,7 @@ def handle(self, *args: Any, **options: Any) -> None: if options["max_topics"] is None: # If max_topics is not set, we use a default that's big - # enough "more topics" should appear, and scales slowly + # enough "all topics" should appear, and scales slowly # with the number of messages. options["max_topics"] = 8 + options["num_messages"] // 1000