diff --git a/docs/chat-zulip-org.md b/docs/chat-zulip-org.md index e453c37936..1881be0dbd 100644 --- a/docs/chat-zulip-org.md +++ b/docs/chat-zulip-org.md @@ -69,9 +69,9 @@ everyone, even non-developers: for discussing Zulip's translations. There are dozens of streams for development discussions in the Zulip -community (e.g. one for each app, etc.); check out the /#subscriptions -page to see the descriptions for all of them. Relevant to almost -everyone are these: +community (e.g. one for each app, etc.); check out the +[Streams page](https://chat.zulip.org/#streams/all) to see the +descriptions for all of them. Relevant to almost everyone are these: * [#checkins](https://chat.zulip.org/#narrow/stream/checkins) is for progress updates on what you're working on and its status; usually diff --git a/docs/user-docs.md b/docs/user-docs.md index d75ae1ac10..399cd5df9c 100644 --- a/docs/user-docs.md +++ b/docs/user-docs.md @@ -278,8 +278,8 @@ immediately after the title. ### **All streams** `{!all-streams.md!}` macro * **About:** Explains how to view all streams in the organization on the -**Subscriptions** page. Usually formatted as a tip and preceded by the -[**Subscriptions** macro](#subscriptions-subscriptions-md-macro) and the +**Streams** page. Usually formatted as a tip and preceded by the +[**Streams** macro](#streams-subscriptions-md-macro) and the [**Filter streams** macro](#filter-streams-filter-streams-md-macro). * **Contents:** @@ -298,7 +298,7 @@ immediately after the title. ``` ```.md 1. [Find the relevant stream](/help/browse-and-join-streams#browse-streams) on the - [Subscriptions](/#subscriptions) page. You can search for specific streams by entering the + [Streams](/#streams) page. You can search for specific streams by entering the name of the stream in the **Filter streams** input. !!! tip "" If you wish to see streams that you aren't subscribed to, click on the @@ -352,8 +352,8 @@ following content into a step. ### **Filter streams** `{!filter-streams.md!}` macro * **About:** Explains how to search for specific streams in the - **Subscriptions** page using the **Filter streams** input. Usually preceded by - the [**Subscriptions** macro](#subscriptions-subscriptions-md-macro). + **Streams** page using the **Filter streams** input. Usually preceded by + the [**Streams** macro](#streams-subscriptions-md-macro). * **Contents:** ```.md @@ -368,7 +368,7 @@ following content into a step. ``` ```.md 1. [Find the relevant stream](/help/browse-and-join-streams#browse-streams) on the - [Subscriptions](/#subscriptions) page. You can search for specific streams by entering the + [Streams](/#streams) page. You can search for specific streams by entering the name of the stream in the **Filter streams** input. ``` @@ -485,12 +485,12 @@ instruction and the [**Down chevron** macro](#down-chevron-down-chevron-md-macro ### **Stream settings** `{!stream-settings.md!}` macro * **About:** Notifies readers about the changes in the - **Subscriptions** page when a stream is selected; usually followed + **Streams** page when a stream is selected; usually followed by an instruction. * **Contents:** ```.md - the right side of the [Subscriptions](/#subscriptions) page, labeled + the right side of the [Streams](/#streams) page, labeled **Stream settings**, will now display the selected stream's settings. ``` @@ -500,14 +500,14 @@ instruction and the [**Down chevron** macro](#down-chevron-down-chevron-md-macro ``` ```.md 1. Click on the stream you want to edit; the right side of the - [Subscriptions](/#subscriptions) page, labeled **Stream settings**, will + [Streams](/#streams) page, labeled **Stream settings**, will now display the selected stream's settings. ``` ### **Stream settings scroll** `{!stream-settings.md!}` macro * **About:** Instructs readers to scroll down to a particular section on the -**Subscriptions** page after making sure their cursors are hovering above the +**Streams** page after making sure their cursors are hovering above the **Streams Settings** section. * **Contents:** @@ -529,15 +529,15 @@ instruction and the [**Down chevron** macro](#down-chevron-down-chevron-md-macro selected stream. ``` -### **Subscriptions** `{!subscriptions.md!}` macro +### **Streams** `{!subscriptions.md!}` macro -* **About:** Used in documentation that direct users to the **Subscriptions** page. +* **About:** Used in documentation that direct users to the **Streams** page. Often followed by the [**Filter streams** macro](#filter-streams-filter-streams-md-macro). * **Contents:** ```.md 1. [Find the relevant stream](/help/browse-and-join-streams#browse-streams) on - the [Subscriptions](/#subscriptions) page. + the [Streams](/#streams) page. ``` * **Example usage and rendering:** @@ -547,7 +547,7 @@ Often followed by the [**Filter streams** macro](#filter-streams-filter-streams- ``` ```.md 1. [Find the relevant stream](/help/browse-and-join-streams#browse-streams) on the - [Subscriptions](/#subscriptions) page. You can search for specific streams by entering the + [Streams](/#streams) page. You can search for specific streams by entering the name of the stream in the **Filter streams** input. ``` diff --git a/frontend_tests/casper_tests/05-subscriptions.js b/frontend_tests/casper_tests/05-subscriptions.js index dfe4f72cef..196ce50204 100644 --- a/frontend_tests/casper_tests/05-subscriptions.js +++ b/frontend_tests/casper_tests/05-subscriptions.js @@ -5,17 +5,17 @@ common.start_and_log_in(); casper.then(function () { var menu_selector = '#settings-dropdown'; - casper.test.info('Subscriptions page'); + casper.test.info('Streams page'); casper.waitUntilVisible(menu_selector, function () { casper.click(menu_selector); casper.then(function () { - casper.click('a[href^="#subscriptions"]'); + casper.click('a[href^="#streams"]'); casper.test.assertUrlMatch( - /^http:\/\/[^/]+\/#subscriptions/, - 'URL suggests we are on subscriptions page'); + /^http:\/\/[^/]+\/#streams/, + 'URL suggests we are on streams page'); casper.waitUntilVisible('#subscription_overlay.new-style', function () { - casper.test.assertExists('#subscription_overlay.new-style', 'Subscriptions page is active'); + casper.test.assertExists('#subscription_overlay.new-style', 'Streams page is active'); }); }); }); diff --git a/frontend_tests/casper_tests/09-navigation.js b/frontend_tests/casper_tests/09-navigation.js index ee8ae03449..3d7d2d6689 100644 --- a/frontend_tests/casper_tests/09-navigation.js +++ b/frontend_tests/casper_tests/09-navigation.js @@ -46,7 +46,7 @@ function then_navigate_to_subscriptions() { var menu_selector = '#settings-dropdown'; casper.waitUntilVisible(menu_selector, function () { casper.click(menu_selector); - casper.click('a[href^="#subscriptions"]'); + casper.click('a[href^="#streams"]'); casper.waitUntilVisible("#subscription_overlay", function () { casper.test.assertExists('#subscriptions_table', "#subscriptions page is active"); }); diff --git a/frontend_tests/casper_tests/10-admin.js b/frontend_tests/casper_tests/10-admin.js index 9529cb3745..5c7541e769 100644 --- a/frontend_tests/casper_tests/10-admin.js +++ b/frontend_tests/casper_tests/10-admin.js @@ -38,7 +38,7 @@ casper.then(function () { casper.then(function () { // Leave the page and return casper.click('#settings-dropdown'); - casper.click('a[href^="#subscriptions"]'); + casper.click('a[href^="#streams"]'); casper.click('#settings-dropdown'); casper.click('a[href^="#administration"]'); }); @@ -272,7 +272,7 @@ casper.then(function () { casper.then(function () { // Leave the page and return casper.click('#settings-dropdown'); - casper.click('a[href^="#subscriptions"]'); + casper.click('a[href^="#streams"]'); casper.click('#settings-dropdown'); casper.click('a[href^="#administration"]'); diff --git a/static/js/click_handlers.js b/static/js/click_handlers.js index 0860532663..59f4855e81 100644 --- a/static/js/click_handlers.js +++ b/static/js/click_handlers.js @@ -389,7 +389,7 @@ $(function () { e.preventDefault(); e.stopPropagation(); - window.location.hash = "subscriptions/all"; + window.location.hash = "streams/all"; }); // FEEDBACK diff --git a/static/js/compose.js b/static/js/compose.js index 8e0ab00694..d7eef53fe5 100644 --- a/static/js/compose.js +++ b/static/js/compose.js @@ -803,7 +803,7 @@ function validate_stream_message_address_info(stream_name) { case "does-not-exist": response = "

The stream " + Handlebars.Utils.escapeExpression(stream_name) + " does not exist.

" + - "

Manage your subscriptions on your Streams page.

"; + "

Manage your subscriptions on your Streams page.

"; compose_error(response, $('#stream')); return false; case "error": @@ -811,7 +811,7 @@ function validate_stream_message_address_info(stream_name) { case "not-subscribed": response = "

You're not subscribed to the stream " + Handlebars.Utils.escapeExpression(stream_name) + ".

" + - "

Manage your subscriptions on your Streams page.

"; + "

Manage your subscriptions on your Streams page.

"; compose_error(response, $('#stream')); return false; } diff --git a/static/js/hashchange.js b/static/js/hashchange.js index 5f60dfd2e0..c537102eeb 100644 --- a/static/js/hashchange.js +++ b/static/js/hashchange.js @@ -181,8 +181,8 @@ function do_hashchange(from_reload) { case "#": activate_home_tab(); break; - case "#subscriptions": - ui.change_tab_to("#subscriptions"); + case "#streams": + ui.change_tab_to("#streams"); break; case "#drafts": ui.change_tab_to("#drafts"); @@ -234,7 +234,7 @@ function get_hash_components() { // require a reload or overlay change to run. var get_hash_group = (function () { var groups = [ - ["subscriptions"], + ["streams"], ["settings", "administration"], ]; @@ -254,8 +254,8 @@ var get_hash_group = (function () { }()); function should_ignore(hash) { - // an array of hashes to ignore (eg. ["subscriptions", "settings", "administration"]). - var ignore_list = ["subscriptions", "drafts", "settings", "administration"]; + // Hash changes within this list are overlaws and should not unnarrow (etc.) + var ignore_list = ["streams", "drafts", "settings", "administration"]; var main_hash = get_main_hash(hash); return (ignore_list.indexOf(main_hash) > -1); @@ -285,7 +285,7 @@ function hashchanged(from_reload, e) { ignore.prev = old_hash; } - if (base === "subscriptions") { + if (base === "streams") { subs.launch(get_hash_components()); } else if (base === "drafts") { drafts.launch(); diff --git a/static/js/stream_popover.js b/static/js/stream_popover.js index ca6987883b..430a1599ff 100644 --- a/static/js/stream_popover.js +++ b/static/js/stream_popover.js @@ -173,7 +173,7 @@ exports.register_stream_handlers = function () { var sub = stream_popover_sub(e); exports.hide_stream_popover(); - window.location.hash = "#subscriptions"; + window.location.hash = "#streams"; // the template for subs needs to render. subs.onlaunch("narrow_to_row", function () { diff --git a/static/js/subs.js b/static/js/subs.js index ef238d6e19..d0a594c794 100644 --- a/static/js/subs.js +++ b/static/js/subs.js @@ -779,7 +779,7 @@ exports.change_state = (function () { // if there are any arguments the state should be modified. if (hash.arguments.length > 0) { - // if in #subscriptions/new form. + // if in #streams/new form. if (hash.arguments[0] === "new") { $("#create_stream_button").click(); components.toggle.lookup("stream-filter-toggle").goto("All streams"); @@ -1138,10 +1138,10 @@ $(function () { $('#create_stream_name').focus(); } - // change the hash to #subscriptions/new to allow for linking and + // change the hash to #streams/new to allow for linking and // easy discovery. - window.location.hash = "#subscriptions/new"; + window.location.hash = "#streams/new"; }); $('body').on('change', '#user-checkboxes input, #make-invite-only input', update_announce_stream_state); @@ -1414,7 +1414,7 @@ $(function () { var stream_id = $(this).attr("data-stream-id"); var sub = stream_data.get_sub_by_id(stream_id); - window.location.hash = "#subscriptions" + "/" + + window.location.hash = "#streams" + "/" + stream_id + "/" + hashchange.encodeHashComponent(sub.name); } @@ -1540,7 +1540,7 @@ function focus_on_narrowed_stream() { exports.show_and_focus_on_narrow = function () { $(document).one('subs_page_loaded.zulip', focus_on_narrowed_stream); - ui.change_tab_to("#subscriptions"); + ui.change_tab_to("#streams"); }; return exports; diff --git a/static/templates/settings/notification-settings.handlebars b/static/templates/settings/notification-settings.handlebars index a98e20683f..d6a18f8b7c 100644 --- a/static/templates/settings/notification-settings.handlebars +++ b/static/templates/settings/notification-settings.handlebars @@ -43,7 +43,7 @@

- {{#tr this}}Change notification settings for individual streams on your Streams page.{{/tr}} + {{#tr this}}Change notification settings for individual streams on your Streams page.{{/tr}}

diff --git a/static/templates/settings/streams-list-admin.handlebars b/static/templates/settings/streams-list-admin.handlebars index aa6b84cf75..396d585126 100644 --- a/static/templates/settings/streams-list-admin.handlebars +++ b/static/templates/settings/streams-list-admin.handlebars @@ -3,7 +3,7 @@ {{t "Delete streams" }}
-

Most stream administration is done on the subscriptions page.

+

{{#tr this}}Most stream administration is done on the Streams page.{{/tr}}

diff --git a/static/templates/subscription_table_body.handlebars b/static/templates/subscription_table_body.handlebars index 9f14be12af..a755dafd2b 100644 --- a/static/templates/subscription_table_body.handlebars +++ b/static/templates/subscription_table_body.handlebars @@ -3,7 +3,7 @@
- {{t 'Subscriptions' }} + {{t 'Streams' }}
×
diff --git a/templates/zerver/emails/digest/digest_email.html b/templates/zerver/emails/digest/digest_email.html index dea5152af8..13d45e07fe 100644 --- a/templates/zerver/emails/digest/digest_email.html +++ b/templates/zerver/emails/digest/digest_email.html @@ -79,7 +79,7 @@ Here are some of the hot conversations that have happened while you've been gone

{{ new_streams.html|display_list(4)|safe }}.

-

Click on {% if new_stream_count and new_stream_count > 1 %}a{% else %}the{% endif %} name to check out some of the traffic, or visit your Streams page to subscribe.

+

Click on {% if new_stream_count and new_stream_count > 1 %}a{% else %}the{% endif %} name to check out some of the traffic, or visit your Streams page to subscribe.

{% endif %} {% if new_users %} diff --git a/templates/zerver/emails/digest/digest_email.txt b/templates/zerver/emails/digest/digest_email.txt index 6937ffa793..93aa98cad1 100644 --- a/templates/zerver/emails/digest/digest_email.txt +++ b/templates/zerver/emails/digest/digest_email.txt @@ -42,7 +42,7 @@ Catch up on the rest of these conversations: {{ realm_uri }}.{% endif %} {{ new_streams.plain|display_list(4) }}. -Visit your Streams page to subscribe: {{ realm_uri }}/#subscriptions.{% endif %} +Visit your Streams page to subscribe: {{ realm_uri }}/#streams.{% endif %} {% if new_users %}{% if new_streams.plain or unread_pms or hot_conversations %}And finally, please{% else %}Please{% endif %} welcome {{ new_users|display_list(4) }} to Zulip!{% endif %} diff --git a/templates/zerver/help/browse-and-subscribe-to-streams.md b/templates/zerver/help/browse-and-subscribe-to-streams.md index 8616f2ca1f..4717662a18 100644 --- a/templates/zerver/help/browse-and-subscribe-to-streams.md +++ b/templates/zerver/help/browse-and-subscribe-to-streams.md @@ -15,10 +15,10 @@ configure streams** will appear upon hovering above the cog. ![Streams cog and tooltip](/static/images/help/streams-1.png) 2. After clicking the cog () icon, the -[Subscriptions](/#subscriptions) page will now appear, showing all streams +[Streams](/#streams) page will now appear, showing all streams that you've subscribed to by default. - ![Subscriptions page](/static/images/help/streams-overview.png) + ![Streams page](/static/images/help/streams-overview.png) Here, you can explore all the public streams in the organization. You can also [create a new stream](create-a-stream) by clicking the plus @@ -32,7 +32,7 @@ You can also [create a new stream](create-a-stream) by clicking the plus ![Filter streams box](/static/images/help/filter-stream.png) -* Upon selecting a stream in the [Subscriptions](/#subscriptions) page, +* Upon selecting a stream in the [Streams](/#streams) page, {!stream-settings.md!} ![Stream settings](/static/images/help/stream-overview.png) @@ -60,7 +60,7 @@ button. However, if you were not notified about the stream's creation, you can subscribe to a stream by navigating to the -[Subscriptions](/#subscriptions) page. +[Streams](/#streams) page. {!subscriptions.md!} diff --git a/templates/zerver/help/change-the-color-of-a-stream.md b/templates/zerver/help/change-the-color-of-a-stream.md index 4d92ef88a1..1a6aea938a 100644 --- a/templates/zerver/help/change-the-color-of-a-stream.md +++ b/templates/zerver/help/change-the-color-of-a-stream.md @@ -16,17 +16,17 @@ through the left sidebar. 4. The stream will change colors in the left sidebar, confirming the success of the stream's color change. -## Change the color of a stream through the Subscriptions page +## Change the color of a stream through the Streams page If you want to change the colors of multiple streams at once or specify a hex code for your stream's color, you should change the stream's colors through the -[Subscriptions](/#subscriptions) page. +[Streams](/#streams) page. {!subscriptions.md!} {!filter-streams.md!} 2. Select the stream you want to change the color of in the -[Subscriptions](/#subscriptions) page; {!stream-settings.md!} +[Streams](/#streams) page; {!stream-settings.md!} 2. Under the **Stream settings** section, select the **Stream color** option. @@ -37,5 +37,5 @@ select a color from the color palette. Alternatively, you can use the color picker or enter the hex code of your desired color. Click the **choose** button to save your changes. -4. The stream will change colors in the [Subscriptions](/#subscriptions) page, +4. The stream will change colors in the [Streams](/#streams) page, confirming the success of the stream's color change. diff --git a/templates/zerver/help/configure-audible-notifications.md b/templates/zerver/help/configure-audible-notifications.md index a2417daf4b..753a5c5101 100644 --- a/templates/zerver/help/configure-audible-notifications.md +++ b/templates/zerver/help/configure-audible-notifications.md @@ -16,4 +16,4 @@ select the **Audible notifications** option under **Private messages and @-menti !!! tip "" You can change your notification settings for individual streams on your - [Streams](/#subscriptions) page. + [Streams](/#streams) page. diff --git a/templates/zerver/help/configure-desktop-notifications.md b/templates/zerver/help/configure-desktop-notifications.md index e8ced276b4..289d4e5c32 100644 --- a/templates/zerver/help/configure-desktop-notifications.md +++ b/templates/zerver/help/configure-desktop-notifications.md @@ -16,4 +16,4 @@ check the **Desktop notifications** option under **Private messages and @-mentio !!! tip "" You can change your notification settings for individual streams on your - [Streams](/#subscriptions) page. + [Streams](/#streams) page. diff --git a/templates/zerver/help/create-a-stream.md b/templates/zerver/help/create-a-stream.md index 01c83d0f98..78d2436031 100644 --- a/templates/zerver/help/create-a-stream.md +++ b/templates/zerver/help/create-a-stream.md @@ -27,7 +27,7 @@ the **Filter streams** input. to ask an administrator for help creating each particular stream. 4. After clicking the plus () icon, at -right side of the [Subscriptions](/#subscriptions) page, labeled +right side of the [Streams](/#streams) page, labeled **Create stream**, will now display options for creating a stream. 5. Enter the title of your stream in the **Stream name** input. diff --git a/templates/zerver/help/include/stream-settings.md b/templates/zerver/help/include/stream-settings.md index ab8124bf9c..c5d917e71f 100644 --- a/templates/zerver/help/include/stream-settings.md +++ b/templates/zerver/help/include/stream-settings.md @@ -1,2 +1,2 @@ -the right side of the [Subscriptions](/#subscriptions) page, labeled **Stream settings**, will now display +the right side of the [Streams](/#streams) page, labeled **Stream settings**, will now display the selected stream's settings. diff --git a/templates/zerver/help/include/subscriptions.md b/templates/zerver/help/include/subscriptions.md index 317c5b7cd5..1f99593e2f 100644 --- a/templates/zerver/help/include/subscriptions.md +++ b/templates/zerver/help/include/subscriptions.md @@ -1,2 +1,2 @@ 1. [Find the relevant stream](/help/browse-and-subscribe-to-streams#browse-streams) on -the [Subscriptions](/#subscriptions) page. +the [Streams](/#streams) page. diff --git a/templates/zerver/help/message-a-stream-by-email.md b/templates/zerver/help/message-a-stream-by-email.md index 473a885827..93d816f0ac 100644 --- a/templates/zerver/help/message-a-stream-by-email.md +++ b/templates/zerver/help/message-a-stream-by-email.md @@ -6,7 +6,7 @@ You can send a message to a stream by email by following the following steps. {!filter-streams.md!} 2. Select the stream that you want to message by email in the -[Subscriptions](/#subscriptions) page; {!stream-settings.md!} +[Streams](/#streams) page; {!stream-settings.md!} 3. To send a message to a stream by email, simply send an email to the stream's email address displayed in the **Email address** section. Your email subject diff --git a/templates/zerver/help/pin-a-stream.md b/templates/zerver/help/pin-a-stream.md index 4d6e70ccc5..ac05320d84 100644 --- a/templates/zerver/help/pin-a-stream.md +++ b/templates/zerver/help/pin-a-stream.md @@ -17,17 +17,17 @@ option from the actions dropdown. stream will be pinned the top of the **Streams** section, confirming the success of your pinning. -### Pinning a stream using the [Subscriptions](/#subscriptions) page +### Pinning a stream using the [Streams](/#streams) page -If you want to pin multiple streams at once, you should pin streams through the [Subscriptions](/#subscriptions) page. +If you want to pin multiple streams at once, you should pin streams through the [Streams](/#streams) page. {!subscriptions.md!} {!filter-streams.md!} -2. Select the stream you want to pin in the [Subscriptions](/#subscriptions) page; {!stream-settings.md!} +2. Select the stream you want to pin in the [Streams](/#streams) page; {!stream-settings.md!} 3. Select the **Pin stream to top of left sidebar** option in **Stream settings**. -4. Once you close the [Subscriptions](/#subscriptions) page, the selected stream +4. Once you close the [Streams](/#streams) page, the selected stream will be pinned the top of the **Streams** section, confirming the success of your pinning. diff --git a/templates/zerver/help/set-notifications-for-a-single-stream.md b/templates/zerver/help/set-notifications-for-a-single-stream.md index e8e3297e9c..0c74c2000a 100644 --- a/templates/zerver/help/set-notifications-for-a-single-stream.md +++ b/templates/zerver/help/set-notifications-for-a-single-stream.md @@ -12,7 +12,7 @@ On Zulip, you can set different notification settings for different streams. 3. Click on the {!down-chevron.md!} Select the **Stream settings** option from the dropdown. -4. You will be taken to the [Subscriptions](/#subscriptions) page; +4. You will be taken to the [Streams](/#streams) page; {!stream-settings.md!} 5. Under the **Stream settings** section you can now toggle diff --git a/templates/zerver/help/the-zulip-browser-window.md b/templates/zerver/help/the-zulip-browser-window.md index 16e4a13bd4..ab6283c998 100644 --- a/templates/zerver/help/the-zulip-browser-window.md +++ b/templates/zerver/help/the-zulip-browser-window.md @@ -74,7 +74,7 @@ that you are subscribed to. reveals an input that allows you to search for streams. * Clicking the cog () icon allows you to [navigate](/help/browse-and-subscribe-to-streams#browse-streams) to the - [Subscriptions](/#subscriptions) page. + [Streams](/#streams) page. * Hovering over a stream in the **Streams** section reveals a chevron that allows you to modify the stream's settings when you click on it. * Clicking on a stream in the **Streams** section allows you to narrow your view diff --git a/templates/zerver/help/unsubscribe-from-a-stream.md b/templates/zerver/help/unsubscribe-from-a-stream.md index dcf7016c36..28926bdc3d 100644 --- a/templates/zerver/help/unsubscribe-from-a-stream.md +++ b/templates/zerver/help/unsubscribe-from-a-stream.md @@ -4,13 +4,13 @@ If you want to stop receiving messages from a particular stream in Zulip, you can choose to unsubscribe from that stream. There are two major ways to unsubscribe from a stream: unsubscribing -from a stream through the [Subscriptions](/#subscriptions) page and +from a stream through the [Streams](/#streams) page and unsubscribing from a stream through the stream sidebar. -## Unsubscribing from a stream through the Subscriptions page +## Unsubscribing from a stream through the Streams page If you want to unsubscribe from multiple streams at once, you should unsubscribe -from streams through the [Subscriptions](/#subscriptions) page. +from streams through the [Streams](/#streams) page. {!subscriptions.md!} {!filter-streams.md!} diff --git a/templates/zerver/left_sidebar.html b/templates/zerver/left_sidebar.html index f833c76931..6e3e661abe 100644 --- a/templates/zerver/left_sidebar.html +++ b/templates/zerver/left_sidebar.html @@ -10,7 +10,7 @@

{{ _('STREAMS') }}

- + diff --git a/templates/zerver/navbar.html b/templates/zerver/navbar.html index 0b0631e26a..550b490c30 100644 --- a/templates/zerver/navbar.html +++ b/templates/zerver/navbar.html @@ -50,7 +50,7 @@ #}
  • - + {{ _('Manage streams') }}
    • diff --git a/templates/zerver/subscriptions.html b/templates/zerver/subscriptions.html index 545fe99333..624b3bbae9 100644 --- a/templates/zerver/subscriptions.html +++ b/templates/zerver/subscriptions.html @@ -1,4 +1,4 @@ -{# Subscriptions management tab of the app. #} +{# Streams management tab of the app. #}
    diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py index 79abc059c5..9ef3db6db4 100644 --- a/zerver/tests/test_docs.py +++ b/zerver/tests/test_docs.py @@ -103,7 +103,7 @@ class IntegrationTest(TestCase): 'Zulip settings page') self.assertEqual( context['subscriptions_html'], - 'subscriptions page') + 'streams page') context = dict() context['html_settings_links'] = True @@ -113,7 +113,7 @@ class IntegrationTest(TestCase): 'Zulip settings page') self.assertEqual( context['subscriptions_html'], - 'subscriptions page') + 'streams page') class AuthorsPageTest(ZulipTestCase): def setUp(self): diff --git a/zerver/views/integrations.py b/zerver/views/integrations.py index a6431a49c7..e5bf4999a3 100644 --- a/zerver/views/integrations.py +++ b/zerver/views/integrations.py @@ -89,10 +89,10 @@ def add_integrations_context(context): if context["html_settings_links"]: settings_html = 'Zulip settings page' - subscriptions_html = 'subscriptions page' + subscriptions_html = 'streams page' else: settings_html = 'Zulip settings page' - subscriptions_html = 'subscriptions page' + subscriptions_html = 'streams page' context['settings_html'] = settings_html context['subscriptions_html'] = subscriptions_html