diff --git a/docs/testing/manual-testing.md b/docs/testing/manual-testing.md index 9f2934237f..f1418a5854 100644 --- a/docs/testing/manual-testing.md +++ b/docs/testing/manual-testing.md @@ -65,7 +65,7 @@ Try narrowing from the message view: - narrow to a group PM - Click on the Zulip logo - narrow to a topic - - click on the Zulip logo (and verify you're in the Recent topics view) + - click on the Zulip logo (and verify you're in the Recent conversations view) ### Messagebox diff --git a/frontend_tests/puppeteer_tests/message-basics.ts b/frontend_tests/puppeteer_tests/message-basics.ts index 48c14e4e1e..7066190d6e 100644 --- a/frontend_tests/puppeteer_tests/message-basics.ts +++ b/frontend_tests/puppeteer_tests/message-basics.ts @@ -95,7 +95,7 @@ async function un_narrow_by_clicking_org_icon(page: Page): Promise { async function expect_recent_topics(page: Page): Promise { await page.waitForSelector("#recent_topics_table", {visible: true}); - assert.strictEqual(await page.title(), "Recent topics - Zulip Dev - Zulip"); + assert.strictEqual(await page.title(), "Recent conversations - Zulip Dev - Zulip"); } async function test_navigations_from_home(page: Page): Promise { diff --git a/static/js/message_view_header.js b/static/js/message_view_header.js index ac7cfd3dd2..88f669f568 100644 --- a/static/js/message_view_header.js +++ b/static/js/message_view_header.js @@ -22,7 +22,7 @@ function make_message_view_header(filter) { const message_view_header = {}; if (recent_topics_util.is_visible()) { return { - title: $t({defaultMessage: "Recent topics"}), + title: $t({defaultMessage: "Recent conversations"}), icon: "clock-o", }; } diff --git a/static/js/recent_topics_ui.js b/static/js/recent_topics_ui.js index f729040ac4..784be7ba95 100644 --- a/static/js/recent_topics_ui.js +++ b/static/js/recent_topics_ui.js @@ -762,7 +762,7 @@ export function show() { compose_closed_ui.update_buttons_for_recent_topics(); narrow_state.reset_current_filter(); - const recent_topics_title = $t({defaultMessage: "Recent topics"}); + const recent_topics_title = $t({defaultMessage: "Recent conversations"}); narrow.set_narrow_title(recent_topics_title); message_view_header.render_title_area(); narrow.handle_middle_pane_transition(); diff --git a/static/js/settings_config.ts b/static/js/settings_config.ts index e51591f0ce..19e7d561ef 100644 --- a/static/js/settings_config.ts +++ b/static/js/settings_config.ts @@ -58,7 +58,7 @@ export const user_list_style_values = { export const default_view_values = { recent_topics: { code: "recent_topics", - description: $t({defaultMessage: "Recent topics"}), + description: $t({defaultMessage: "Recent conversations"}), }, all_messages: { code: "all_messages", diff --git a/static/templates/bookend.hbs b/static/templates/bookend.hbs index ffb255c0c4..7c8710f0bf 100644 --- a/static/templates/bookend.hbs +++ b/static/templates/bookend.hbs @@ -2,7 +2,7 @@
{{#if is_spectator}} - {{t "Browse recent topics" }} + {{t "Browse recent conversations" }} {{else}} diff --git a/static/templates/keyboard_shortcuts.hbs b/static/templates/keyboard_shortcuts.hbs index 6126366a1f..f505dc32a8 100644 --- a/static/templates/keyboard_shortcuts.hbs +++ b/static/templates/keyboard_shortcuts.hbs @@ -256,11 +256,11 @@ - + - + diff --git a/static/templates/left_sidebar.hbs b/static/templates/left_sidebar.hbs index da6d015868..a02e5295f7 100644 --- a/static/templates/left_sidebar.hbs +++ b/static/templates/left_sidebar.hbs @@ -13,13 +13,13 @@ -
  • +
  • {{~!-- squash whitespace --~}} - {{t 'Recent topics' }} + {{t 'Recent conversations' }}
  • diff --git a/templates/corporate/case-studies/asciidoctor-case-study.md b/templates/corporate/case-studies/asciidoctor-case-study.md index fc34dbb251..b7cc639f05 100644 --- a/templates/corporate/case-studies/asciidoctor-case-study.md +++ b/templates/corporate/case-studies/asciidoctor-case-study.md @@ -67,10 +67,10 @@ discourse was gone,” Dan says. With Zulip, Dan has developed a comfortable workflow for catching up on conversations after being away. “When I start my day, I open up the [Recent -topics](/help/recent-topics) page and work through the topics that have activity -on-by-one,” Dan describes. More casual community participants can [skim the -topic list](/help/reading-strategies) to find interesting discussions, and mark -topics they don’t care about as read with a single click. +topics](/help/recent-conversations) page and work through the topics that have +activity on-by-one,” Dan describes. More casual community participants can [skim +the topic list](/help/reading-strategies) to find interesting discussions, and +mark topics they don’t care about as read with a single click. ## Powerful moderation tools help keep conversations on track diff --git a/templates/corporate/case-studies/lean-case-study.md b/templates/corporate/case-studies/lean-case-study.md index 7b013a41a0..555435298f 100644 --- a/templates/corporate/case-studies/lean-case-study.md +++ b/templates/corporate/case-studies/lean-case-study.md @@ -103,7 +103,7 @@ It just worked.” Zulip’s unique combination of [topic-based organization](/why-zulip/) with a casual chat app feel helps the Lean community create a welcoming environment for newcomers. By [browsing -recent topics](/help/recent-topics), newcomers can see what’s +recent conversations](/help/recent-conversations), newcomers can see what’s being discussed without being overwhelmed. They can start a new topic to ask basic questions without worrying about interrupting other conversations. Zulip’s threading model makes managing conversations incredibly efficient, allowing more diff --git a/templates/corporate/case-studies/recurse-center-case-study.md b/templates/corporate/case-studies/recurse-center-case-study.md index 53c24ffcab..e03b896939 100644 --- a/templates/corporate/case-studies/recurse-center-case-study.md +++ b/templates/corporate/case-studies/recurse-center-case-study.md @@ -81,9 +81,9 @@ different levels of engagement. Current RC members can immerse themselves in the ongoing discussions, occasionally muting topics they don’t want to follow. RC leaders monitor the community asynchronously, reviewing the ongoing conversations a few times a day and jumping in as needed. Finally, alumni can -drop by on occasion to skim [recent -topics](https://zulip.com/help/recent-topics), catch up on their friends’ update -threads, or search the discussion history for a topic of interest. +drop by on occasion to skim [recent conversations](/help/recent-conversations), +catch up on their friends’ update threads, or search the discussion history for +a topic of interest. “Our community is 10 years old and spans continents,” RC’s Head of Retreat Rachel Petacat says. “Zulip provides the continuity that lets us maintain our @@ -170,9 +170,9 @@ doesn’t see a message in some channel on that day, they’ll *never* see it. Without dedicating a lot of time, John is able to stay involved in the community on Zulip, and share his expertise where relevant. “I scan [recent -topics](https://zulip.com/help/recent-topics) for places where I could help, and -rely on email notifications for private messages,” John explains. The experience -of keeping up on Zulip is in sharp contrast with Slack, which John uses at work: +topics](/help/recent-conversations) for places where I could help, and rely on +email notifications for private messages,” John explains. The experience of +keeping up on Zulip is in sharp contrast with Slack, which John uses at work: “It’s so hard to keep up with the Slack firehose.” > “Zulip allows people who are engaging with the community at different paces to connect.” diff --git a/templates/corporate/development-community.md b/templates/corporate/development-community.md index db7e11d913..5578aede0a 100644 --- a/templates/corporate/development-community.md +++ b/templates/corporate/development-community.md @@ -213,7 +213,7 @@ difficult and rarely a useful goal. To make the best use of your time, we highly recommend that you unsubscribe from streams that you aren’t interested in, mute streams that are only of occasional interest, and make use of [Zulip’s skimming features](/help/reading-strategies), -like Recent Topics, to spend your time on conversations that interest +like Recent conversations, to spend your time on topics that interest you. ## Searching for past conversations diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index 938d933a1b..ef889d0543 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -85,7 +85,7 @@
  • Find active conversations, or see what happened while you were away, - with the Recent Topics + with the Recent conversations view. Read the topics you care about, and skip the rest.
    • diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index ae9f813b1e..5be0e10763 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -68,7 +68,7 @@
  • Find active conversations, or see what happened while you were away, - with the Recent Topics view. + with the Recent conversations view.
  • diff --git a/templates/zerver/help/configure-default-new-user-settings.md b/templates/zerver/help/configure-default-new-user-settings.md index db2e1bb7cb..c71205e992 100644 --- a/templates/zerver/help/configure-default-new-user-settings.md +++ b/templates/zerver/help/configure-default-new-user-settings.md @@ -16,7 +16,8 @@ preference settings, including the following: * [Displaying availability to other users](/help/status-and-availability) * [Allowing others to see when the user has read messages](/help/read-receipts) * Display settings, including: - * Default view ([Recent topics](/help/recent-topics) vs. [All messages](/help/reading-strategies#all-messages)) + * Default view ([Recent conversations](/help/recent-conversations) vs. + [All messages](/help/reading-strategies#all-messages)) * [Light theme vs. dark theme](/help/dark-theme) * [Emoji theme](/help/emoji-and-emoticons#change-your-emoji-set) * Notification settings, including: diff --git a/templates/zerver/help/configure-default-view.md b/templates/zerver/help/configure-default-view.md index d723f9b12d..ab9ba12234 100644 --- a/templates/zerver/help/configure-default-view.md +++ b/templates/zerver/help/configure-default-view.md @@ -5,7 +5,7 @@ to the Zulip web app. You can also navigate to the default view via keyboard shortcuts. The default views available in Zulip are -[Recent topics](/help/recent-topics) and +[Recent conversations](/help/recent-conversations) and [All messages](/help/reading-strategies#all-messages). See [Reading strategies](/help/reading-strategies) for recommendations on how to use these views. @@ -19,9 +19,9 @@ shortcut. Organization administrators can [set the default view for their organization](/help/configure-default-new-user-settings) to -[**Recent topics**](/help/recent-topics) or +[**Recent conversations**](/help/recent-conversations) or [**All messages**](/help/reading-strategies#all-messages). -**Recent topics** is especially recommended for high-traffic +**Recent conversations** is especially recommended for high-traffic organizations, and is configured by default. You can customize your personal default view regardless of @@ -67,5 +67,5 @@ shortcut. ## Related articles * [Reading strategies](/help/reading-strategies) -* [Recent topics](/help/recent-topics) +* [Recent conversations](/help/recent-conversations) * [Keyboard shortcuts](/help/keyboard-shortcuts) diff --git a/templates/zerver/help/finding-a-topic-to-read.md b/templates/zerver/help/finding-a-topic-to-read.md index b6afd2e91b..7bd95db2cf 100644 --- a/templates/zerver/help/finding-a-topic-to-read.md +++ b/templates/zerver/help/finding-a-topic-to-read.md @@ -2,9 +2,9 @@ Like your email inbox, Zulip works best if you read it topic-by-topic. -## From Recent topics +## From Recent conversations -{!recent-topics.md!} +{!recent-conversations.md!} ## From the list of streams diff --git a/templates/zerver/help/getting-started-with-zulip.md b/templates/zerver/help/getting-started-with-zulip.md index ffc3a2f02f..a32ca8af4f 100644 --- a/templates/zerver/help/getting-started-with-zulip.md +++ b/templates/zerver/help/getting-started-with-zulip.md @@ -22,9 +22,9 @@ Like your email inbox, Zulip works best if you read it topic-by-topic. ### Finding a topic to read -#### From Recent topics +#### From Recent conversations -{!recent-topics.md!} +{!recent-conversations.md!} #### From the list of streams diff --git a/templates/zerver/help/include/reading-topics.md b/templates/zerver/help/include/reading-topics.md index 6a7d6cba86..29b17125a7 100644 --- a/templates/zerver/help/include/reading-topics.md +++ b/templates/zerver/help/include/reading-topics.md @@ -1,8 +1,8 @@ {start_tabs} -{tab|via-recent-topics} +{tab|via-recent-conversations} -1. Open **Recent topics** from the left sidebar or by pressing the +1. Open **Recent conversations** from the left sidebar or by pressing the Esc key. 1. Click on the name of a topic in the **Topic** column. @@ -16,7 +16,7 @@ 1. You can then click on another topic in the left sidebar, use the N key to go to the next unread topic, or go back to the - **Recent topics** view. + **Recent conversations** view. {tab|via-left-sidebar} diff --git a/templates/zerver/help/include/recent-topics.md b/templates/zerver/help/include/recent-conversations.md similarity index 68% rename from templates/zerver/help/include/recent-topics.md rename to templates/zerver/help/include/recent-conversations.md index 278ed00d79..9e4e68abc7 100644 --- a/templates/zerver/help/include/recent-topics.md +++ b/templates/zerver/help/include/recent-conversations.md @@ -1,10 +1,10 @@ -Use the **Recent topics** view to get an overview of all the ongoing +Use the **Recent conversations** view to get an overview of all the ongoing conversations. This view is particularly useful for catching up on messages sent while you were away. {start_tabs} -1. Open **Recent topics** from the left sidebar or by pressing the +1. Open **Recent conversations** from the left sidebar or by pressing the Esc key. 1. The filters at the top help you quickly find relevant conversations. diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md index a1d90f2b4b..f3d1a7f46a 100755 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -77,7 +77,7 @@ ## Reading messages * [Reading strategies](/help/reading-strategies) -* [Recent topics](/help/recent-topics) +* [Recent conversations](/help/recent-conversations) * [Marking messages as read](/help/marking-messages-as-read) * [Marking messages as unread](/help/marking-messages-as-unread) * [Emoji reactions](/help/emoji-reactions) diff --git a/templates/zerver/help/keyboard-shortcuts.md b/templates/zerver/help/keyboard-shortcuts.md index 0272dc57b4..7086b3c151 100644 --- a/templates/zerver/help/keyboard-shortcuts.md +++ b/templates/zerver/help/keyboard-shortcuts.md @@ -161,16 +161,16 @@ below, and add more to your repertoire as needed. don't show up in any views (including All messages), and don't contribute to unread counts. Read more about [muting topics](/help/mute-a-topic). -## Recent topics +## Recent conversations -* **View recent topics**: T +* **View recent conversations**: T -* **Search recent topics**: T +* **Search recent conversations**: T -* **Escape from recent topics search**: Esc or arrow keys +* **Escape from recent conversations search**: Esc or arrow keys -* **Navigate recent topics**: Use arrow keys or vim keys (J, - K, L, H). +* **Navigate recent conversations**: Use arrow keys or vim keys + (J, K, L, H). Use Enter to engage with elements. diff --git a/templates/zerver/help/mute-a-topic.md b/templates/zerver/help/mute-a-topic.md index a6b9d109a3..05fbd34ae0 100644 --- a/templates/zerver/help/mute-a-topic.md +++ b/templates/zerver/help/mute-a-topic.md @@ -1,7 +1,7 @@ # Mute a topic Messages from muted topics do not show up in either **All messages** -or **Recent topics**, nor do they generate notifications (including +or **Recent conversations**, nor do they generate notifications (including [alert word](/help/pm-mention-alert-notifications#alert-words) notifications), unless you are [mentioned](/help/mention-a-user-or-group). They also do not contribute to stream unread counts. diff --git a/templates/zerver/help/mute-a-user.md b/templates/zerver/help/mute-a-user.md index be74e0a128..56526dcca4 100644 --- a/templates/zerver/help/mute-a-user.md +++ b/templates/zerver/help/mute-a-user.md @@ -34,8 +34,8 @@ have the following effects: for all messages. Zulip never shares whether or not you have read a message with a user you've muted. -* Recent topics and other features that display avatars will show a - generic user symbol in place of a muted user's profile picture. +* **Recent conversations** and other features that display avatars will + show a generic user symbol in place of a muted user's profile picture. * To avoid interfering with administration tasks, stream and organization settings display muted users' names and other details. diff --git a/templates/zerver/help/reading-strategies.md b/templates/zerver/help/reading-strategies.md index d8bc1ade02..75846befb4 100644 --- a/templates/zerver/help/reading-strategies.md +++ b/templates/zerver/help/reading-strategies.md @@ -15,9 +15,9 @@ topic-by-topic. ### Finding a topic to read -#### From Recent topics +#### From Recent conversations -{!recent-topics.md!} +{!recent-conversations.md!} #### From the list of streams @@ -62,7 +62,7 @@ like to reply to later. ## Related articles * [Getting started with Zulip](/help/getting-started-with-zulip) -* [Recent topics](/help/recent-topics) +* [Recent conversations](/help/recent-conversations) * [Searching for messages](/help/search-for-messages) * [Marking messages as read](/help/marking-messages-as-read) * [Marking messages as unread](/help/marking-messages-as-unread) diff --git a/templates/zerver/help/recent-topics.md b/templates/zerver/help/recent-conversations.md similarity index 86% rename from templates/zerver/help/recent-topics.md rename to templates/zerver/help/recent-conversations.md index 836d34ed29..94b4288f63 100644 --- a/templates/zerver/help/recent-topics.md +++ b/templates/zerver/help/recent-conversations.md @@ -1,6 +1,6 @@ -# Recent topics +# Recent conversations -{!recent-topics.md!} +{!recent-conversations.md!} !!! keyboard_tip "" diff --git a/zerver/lib/markdown/tabbed_sections.py b/zerver/lib/markdown/tabbed_sections.py index 8e880226de..31b4adc069 100644 --- a/zerver/lib/markdown/tabbed_sections.py +++ b/zerver/lib/markdown/tabbed_sections.py @@ -69,7 +69,7 @@ TAB_SECTION_LABELS = { "custom-proxy-settings": "Custom proxy settings", "stream": "From a stream view", "not-stream": "From other views", - "via-recent-topics": "Via recent topics", + "via-recent-conversations": "Via recent conversations", "via-left-sidebar": "Via left sidebar", "instructions-for-all-platforms": "Instructions for all platforms", "public-streams": "Public streams", diff --git a/zerver/lib/onboarding.py b/zerver/lib/onboarding.py index a027f6f1f6..323f2d9254 100644 --- a/zerver/lib/onboarding.py +++ b/zerver/lib/onboarding.py @@ -154,7 +154,7 @@ def select_welcome_bot_response(human_response_lower: str) -> str: ) + "\n\n", _( - "Check out [Recent topics](#recent_topics) to see what's happening! " + "Check out [Recent conversations](#recent_topics) to see what's happening! " 'You can return to this conversation by clicking "Private messages" in the upper left.' ), ] diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 671e61898e..868ced5bdd 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -21,6 +21,7 @@ POLICY_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ # Add URL redirects for help center documentation here: + URLRedirect("/help/recent-topics", "/help/recent-conversations"), URLRedirect( "/help/add-custom-profile-fields", "/help/custom-profile-fields", diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 0b563be2c8..9ec9fd2ed0 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -8516,7 +8516,7 @@ paths: in: query description: | Whether to use the [maximum available screen width](/help/enable-full-width-display) - for the web app's center panel (message feed, recent topics) on wide screens. + for the web app's center panel (message feed, recent conversations) on wide screens. schema: type: boolean example: true @@ -8586,7 +8586,7 @@ paths: The [default view](/help/configure-default-view) used when opening a new Zulip web app window or hitting the `Esc` keyboard shortcut repeatedly. - - "recent_topics" - Recent topics view + - "recent_topics" - Recent conversations view - "all_messages" - All messages view schema: type: string @@ -10544,7 +10544,7 @@ paths: type: boolean description: | Whether to use the [maximum available screen width](/help/enable-full-width-display) - for the web app's center panel (message feed, recent topics) on wide screens. + for the web app's center panel (message feed, recent conversations) on wide screens. high_contrast_mode: type: boolean description: | @@ -10594,7 +10594,7 @@ paths: The [default view](/help/configure-default-view) used when opening a new Zulip web app window or hitting the `Esc` keyboard shortcut repeatedly. - - "recent_topics" - Recent topics view + - "recent_topics" - Recent conversations view - "all_messages" - All messages view escape_navigates_to_default_view: type: boolean @@ -12468,7 +12468,7 @@ paths: type: boolean description: | Whether to use the [maximum available screen width](/help/enable-full-width-display) - for the web app's center panel (message feed, recent topics) on wide screens. + for the web app's center panel (message feed, recent conversations) on wide screens. high_contrast_mode: type: boolean description: | @@ -12518,7 +12518,7 @@ paths: The [default view](/help/configure-default-view) used when opening a new Zulip web app window or hitting the `Esc` keyboard shortcut repeatedly. - - "recent_topics" - Recent topics view + - "recent_topics" - Recent conversations view - "all_messages" - All messages view escape_navigates_to_default_view: type: boolean @@ -13399,7 +13399,7 @@ paths: in: query description: | Whether to use the [maximum available screen width](/help/enable-full-width-display) - for the web app's center panel (message feed, recent topics) on wide screens. + for the web app's center panel (message feed, recent conversations) on wide screens. **Changes**: Before Zulip 5.0 (feature level 80), this setting was managed by the `PATCH /settings/display` endpoint. @@ -13500,7 +13500,7 @@ paths: The [default view](/help/configure-default-view) used when opening a new Zulip web app window or hitting the `Esc` keyboard shortcut repeatedly. - - "recent_topics" - Recent topics view + - "recent_topics" - Recent conversations view - "all_messages" - All messages view **Changes**: Before Zulip 5.0 (feature level 80), this setting was managed by diff --git a/zerver/tests/test_tutorial.py b/zerver/tests/test_tutorial.py index b35cf10fc7..6dd391811a 100644 --- a/zerver/tests/test_tutorial.py +++ b/zerver/tests/test_tutorial.py @@ -98,7 +98,7 @@ class TutorialTests(ZulipTestCase): expected_response = ( "In Zulip, topics [tell you what a message is about](/help/streams-and-topics). " "They are light-weight subjects, very similar to the subject line of an email.\n\n" - "Check out [Recent topics](#recent_topics) to see what's happening! " + "Check out [Recent conversations](#recent_topics) to see what's happening! " 'You can return to this conversation by clicking "Private messages" in the upper left.' ) self.assertEqual(most_recent_message(user).content, expected_response)
    • {{t 'Recent topics' }}{{t 'Recent conversations' }}
    {{t 'View recent topics' }}{{t 'View recent conversations' }} T