From 760d793d6b5aef6e9f05e2db2950576b943a6993 Mon Sep 17 00:00:00 2001 From: Sahil Batra Date: Wed, 18 Oct 2023 15:00:32 +0530 Subject: [PATCH] settings: Rename "default" views to "home" views in settings and docs. This commit renames "default" views to "home" views in the setting labels, keyboard shortcuts list, help documentation and its urls. This commit does not do changes in variable and class names, setting field in database, API docs and changelog. Fixes part of #27251. --- api_docs/changelog.md | 4 +-- help/all-messages.md | 2 +- help/configure-default-new-user-settings.md | 2 +- ...default-view.md => configure-home-view.md} | 32 +++++++++---------- help/inbox.md | 2 +- help/include/all-messages.md | 4 +-- help/include/sidebar_index.md | 2 +- help/keyboard-shortcuts.md | 6 ++-- help/recent-conversations.md | 2 +- web/src/settings_config.ts | 2 +- web/templates/keyboard_shortcuts.hbs | 2 +- web/templates/settings/display_settings.hbs | 4 +-- zerver/lib/url_redirects.py | 1 + zerver/openapi/zulip.yaml | 18 +++++------ 14 files changed, 42 insertions(+), 41 deletions(-) rename help/{configure-default-view.md => configure-home-view.md} (63%) diff --git a/api_docs/changelog.md b/api_docs/changelog.md index d8c8eec03e..990a8a609d 100644 --- a/api_docs/changelog.md +++ b/api_docs/changelog.md @@ -973,7 +973,7 @@ No changes; feature level used for Zulip 5.0 release. * [`POST /register`](/api/register-queue), [`PATCH /settings`](/api/update-settings), [`PATCH /realm/user_settings_defaults`](/api/update-realm-user-settings-defaults): Added user setting `escape_navigates_to_default_view` to allow users to - [disable the keyboard shortcut](/help/configure-default-view) for the `Esc` key that + [disable the keyboard shortcut](/help/configure-home-view) for the `Esc` key that navigates the app to the default view. **Feature level 106** @@ -1475,7 +1475,7 @@ field with an integer field `invite_to_realm_policy`. **Feature level 42** * `PATCH /settings/display`: Added a new `default_view` setting allowing - the user to [set the default view](/help/configure-default-view). + the user to [set the default view](/help/configure-home-view). **Feature level 41** diff --git a/help/all-messages.md b/help/all-messages.md index 21f64c01d9..30b889d248 100644 --- a/help/all-messages.md +++ b/help/all-messages.md @@ -13,5 +13,5 @@ * [Reading strategies](/help/reading-strategies) * [Inbox](/help/inbox) * [Recent conversations](/help/recent-conversations) -* [Configure default view](/help/configure-default-view) +* [Configure home view](/help/configure-home-view) * [Reading conversations](/help/reading-topics) diff --git a/help/configure-default-new-user-settings.md b/help/configure-default-new-user-settings.md index a4c73ac6ff..df0a1253b0 100644 --- a/help/configure-default-new-user-settings.md +++ b/help/configure-default-new-user-settings.md @@ -21,7 +21,7 @@ preference settings, including the following: * [Time format](/help/change-the-time-format) * [Light theme vs. dark theme](/help/dark-theme) * [Emoji theme](/help/emoji-and-emoticons#change-your-emoji-set) - * [Default view](/help/configure-default-view) + * [Home view](/help/configure-home-view) ([Inbox](/help/inbox) vs. [Recent conversations](/help/recent-conversations) vs. [All messages](/help/reading-strategies#all-messages)) diff --git a/help/configure-default-view.md b/help/configure-home-view.md similarity index 63% rename from help/configure-default-view.md rename to help/configure-home-view.md index 2ed2386ef3..f7696434a9 100644 --- a/help/configure-default-view.md +++ b/help/configure-home-view.md @@ -1,24 +1,24 @@ -# Configure default view +# Configure home view -The default view in Zulip is the view you reach after logging in -to the Zulip web app. You can also navigate to the default view via +The home view in Zulip is the view you reach after logging in +to the Zulip web app. You can also navigate to the home view via keyboard shortcuts. -The default views available in Zulip are +The home views available in Zulip are [**Inbox**](/help/inbox), [Recent conversations](/help/recent-conversations), and [All messages](/help/all-messages). See [Reading strategies](/help/reading-strategies) for recommendations on how to use these views. -You can configure which view is set as your default, and whether -the Esc key navigates to the default view. Also, you can -always reach the default view by using the Ctrl + [ +You can configure which view is set as your home view, and whether +the Esc key navigates to the home view. Also, you can +always reach the home view by using the Ctrl + [ shortcut. -## Change default view +## Change home view -Organization administrators can [configure the default view for their +Organization administrators can [configure the home view for their organization](/help/configure-default-new-user-settings) to [**Inbox**](/help/inbox), [**Recent conversations**](/help/recent-conversations), or @@ -32,41 +32,41 @@ streams you follow. - **All messages** is convenient for low-traffic organizations, or for skimming messages as they come in. -You can customize your personal default view regardless of +You can customize your personal home view regardless of organization settings: {start_tabs} {settings_tab|preferences} -1. Under **Advanced**, click on the **Default view** dropdown +1. Under **Advanced**, click on the **Home view** dropdown and select a view. 1. To see your changes in action, open a new Zulip tab, or use a keyboard - shortcut twice to exit the settings and navigate to your default view + shortcut twice to exit the settings and navigate to your home view (Ctrl + [ or Esc if enabled). {end_tabs} -## Configure whether Esc navigates to the default view +## Configure whether Esc navigates to the home view Zulip has a number of [keyboard shortcuts](/help/keyboard-shortcuts) designed to enhance the user experience in the app. By default, the Esc key shortcut will ultimately navigate to -your default view. You can disable this key binding if you would prefer. +your home view. You can disable this key binding if you would prefer. This will not disable other Esc key shortcuts used in Zulip, and will not affect the behavior of the Ctrl + [ shortcut. -### Toggle whether Esc navigates to the default view +### Toggle whether Esc navigates to the home view {start_tabs} {settings_tab|preferences} 1. Under **Advanced**, toggle **Escape key navigates to - default view**, as desired. + home view**, as desired. {end_tabs} diff --git a/help/inbox.md b/help/inbox.md index c849584b8f..cb7c65abfe 100644 --- a/help/inbox.md +++ b/help/inbox.md @@ -4,7 +4,7 @@ {!inbox-intro.md!} -Inbox is a convenient [default view](/help/configure-default-view) if you +Inbox is a convenient [home view](/help/configure-home-view) if you regularly clear all unread messages in your subscribed streams. {!inbox-instructions.md!} diff --git a/help/include/all-messages.md b/help/include/all-messages.md index 4467f4727a..72139c50c8 100644 --- a/help/include/all-messages.md +++ b/help/include/all-messages.md @@ -2,8 +2,8 @@ The **All messages** view is a feed of all the unmuted messages you have received, which combines stream messages and direct messages. It's a great way to see new messages as they come in. -You can configure **All messages** to be the [default -view](/help/configure-default-view#configure-default-view) for the Zulip web app. +You can configure **All messages** to be the [home +view](/help/configure-home-view#configure-home-view) for the Zulip web app. {start_tabs} diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 786fa0f0ac..d716f9b8b1 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -50,7 +50,7 @@ * [Change your time zone](/help/change-your-timezone) * [Change the time format](/help/change-the-time-format) * [Configure emoticon translations](/help/configure-emoticon-translations) -* [Configure default view](/help/configure-default-view) +* [Configure home view](/help/configure-home-view) * [Enable full width display](/help/enable-full-width-display) * [Manage your uploaded files](/help/manage-your-uploaded-files) diff --git a/help/keyboard-shortcuts.md b/help/keyboard-shortcuts.md index 512ada8b54..ae27e5d2e4 100644 --- a/help/keyboard-shortcuts.md +++ b/help/keyboard-shortcuts.md @@ -44,11 +44,11 @@ in the Zulip app to add more to your repertoire as needed. * **Toggle keyboard shortcuts view**: ? -* **Go to default view**: Ctrl + [ (or +* **Go to home view**: Ctrl + [ (or Esc, [if enabled][disable-escape]) - until you are in the [default view](/help/configure-default-view). + until you are in the [home view](/help/configure-home-view). -[disable-escape]: /help/configure-default-view#configure-whether-esc-navigates-to-the-default-view +[disable-escape]: /help/configure-home-view#configure-whether-esc-navigates-to-the-home-view ## Navigation * **Search messages**: / or Ctrl + K diff --git a/help/recent-conversations.md b/help/recent-conversations.md index 3fdb118779..d27e54ecf6 100644 --- a/help/recent-conversations.md +++ b/help/recent-conversations.md @@ -15,4 +15,4 @@ * [Reading strategies](/help/reading-strategies) * [Inbox](/help/inbox) * [All messages](/help/all-messages) -* [Configure default view](/help/configure-default-view) +* [Configure home view](/help/configure-home-view) diff --git a/web/src/settings_config.ts b/web/src/settings_config.ts index 3f15c5f3df..28e6803d25 100644 --- a/web/src/settings_config.ts +++ b/web/src/settings_config.ts @@ -553,7 +553,7 @@ export const display_settings_labels = { "Display names of reacting users when few users have reacted to a message", }), ), - escape_navigates_to_default_view: $t({defaultMessage: "Escape key navigates to default view"}), + escape_navigates_to_default_view: $t({defaultMessage: "Escape key navigates to home view"}), default_language_settings_label: $t({defaultMessage: "Language"}), }; diff --git a/web/templates/keyboard_shortcuts.hbs b/web/templates/keyboard_shortcuts.hbs index a40c6290e4..1eafc06323 100644 --- a/web/templates/keyboard_shortcuts.hbs +++ b/web/templates/keyboard_shortcuts.hbs @@ -53,7 +53,7 @@ ? - {{t 'Go to default view' }} + {{t 'Go to home view' }} Ctrl + [ or Esc diff --git a/web/templates/settings/display_settings.hbs b/web/templates/settings/display_settings.hbs index 7637ef1742..76795d9fe4 100644 --- a/web/templates/settings/display_settings.hbs +++ b/web/templates/settings/display_settings.hbs @@ -125,8 +125,8 @@