Skip to content

Commit

Permalink
left_sidebar: Rename "more topics" to "all topics".
Browse files Browse the repository at this point in the history
This commit renames the occurrences of "more topics"
to "all topics" in comments and documentation.

Fixes zulip#30014
  • Loading branch information
kuv2707 committed May 16, 2024
1 parent 3f80bc1 commit b28a854
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion help/include/left-sidebar-conversations.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion tools/lib/capitalization.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions web/src/topic_list_data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion web/templates/more_topics.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{#unless more_topics_unreads}}zero-topic-unreads{{/unless}}
{{#if more_topics_unread_count_muted}}more_topic_unreads_muted_only{{/if}}">
<div class="topic-box">
<a class="topic-name" tabindex="0">{{t "more topics" }}</a>
<a class="topic-name" tabindex="0">{{t "all topics" }}</a>
<div class="topic-markers-and-controls">
{{#if more_topics_have_unread_mention_messages}}
<span class="unread_mention_info">
Expand Down
2 changes: 1 addition & 1 deletion web/tests/topic_list_data.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion zerver/models/streams.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions zerver/openapi/zulip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion zilencer/management/commands/populate_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit b28a854

Please sign in to comment.