From dd8fb093c88fd11e678846e5f121075e6a5964a0 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 15 Jan 2017 11:21:33 -0800 Subject: [PATCH] Rename 'Stream Settings' to 'Stream settings'. --- docs/README.md | 8 ++++---- docs/manual-testing.md | 4 ++-- static/js/subs.js | 2 +- static/templates/subscription_table_body.handlebars | 2 +- templates/zerver/help/browse-and-join-streams.md | 2 +- templates/zerver/help/change-the-color-of-a-stream.md | 2 +- templates/zerver/help/include/stream-settings.md | 2 +- templates/zerver/help/pin-a-stream.md | 2 +- .../zerver/help/set-notifications-for-a-single-stream.md | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/README.md b/docs/README.md index 2e8e1abddc..db67f470ed 100644 --- a/docs/README.md +++ b/docs/README.md @@ -343,7 +343,7 @@ instruction and the [**Down chevron** macro](#down-chevron-down-chevron-md-macro icon to reveal an actions dropdown. ``` -##### **Stream Settings** `{!stream-settings.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 @@ -352,7 +352,7 @@ instruction and the [**Down chevron** macro](#down-chevron-down-chevron-md-macro * **Contents:** ```.md the right side of the [Subscriptions](/#subscriptions) page, labeled - **Stream Settings**, will now display the selected stream's settings. + **Stream settings**, will now display the selected stream's settings. ``` * **Example usage and rendering:** @@ -361,11 +361,11 @@ 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 + [Subscriptions](/#subscriptions) page, labeled **Stream settings**, will now display the selected stream's settings. ``` -##### **Stream Settings scroll** `{!stream-settings.md!}` macro +##### **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 diff --git a/docs/manual-testing.md b/docs/manual-testing.md index 1178e56eff..1a8bdfed24 100644 --- a/docs/manual-testing.md +++ b/docs/manual-testing.md @@ -215,7 +215,7 @@ Here are the things to test: - Compose (send a message to the stream) - Mark as read (scroll back and then have Hamlet send you a message) - Mute/unmute (do both) - - Unsubcribe (and then go to Stream Settings in the gear menu to resubscribe) + - Unsubcribe (and then go to Stream settings in the gear menu to resubscribe) - Choose custom color (play around with this) - Topic sidebar menus @@ -348,7 +348,7 @@ Miscellaneous: - Use the "x" icon to clear a search. - Use the "Esc" hotkey to clear a search. -### Stream Settings ### +### Stream settings ### Test various UI entry points into stream settings: - Use small gear menu in left sidebar, then filter to "devel". diff --git a/static/js/subs.js b/static/js/subs.js index 61f69315f7..9967ea692f 100644 --- a/static/js/subs.js +++ b/static/js/subs.js @@ -556,7 +556,7 @@ exports.setup_page = function (callback) { $("#subscriptions_table .search-container").prepend(stream_filter_toggle); } - // show the "Stream Settings" header by default. + // show the "Stream settings" header by default. $(".display-type #stream_settings_title").show(); } diff --git a/static/templates/subscription_table_body.handlebars b/static/templates/subscription_table_body.handlebars index 6b4ce9e47a..f2bc550a52 100644 --- a/static/templates/subscription_table_body.handlebars +++ b/static/templates/subscription_table_body.handlebars @@ -29,7 +29,7 @@
Add New Stream
-
Stream Settings
+
Stream settings
Nothing selected. diff --git a/templates/zerver/help/browse-and-join-streams.md b/templates/zerver/help/browse-and-join-streams.md index 55c1e1f85a..73c0598b50 100644 --- a/templates/zerver/help/browse-and-join-streams.md +++ b/templates/zerver/help/browse-and-join-streams.md @@ -35,7 +35,7 @@ You can also [create a new stream](create-a-stream) by clicking the plus * Upon selecting a stream in the [Subscriptions](/#subscriptions) page, {!stream-settings.md!} - ![Stream Settings](/static/images/help/stream-overview.png) + ![Stream settings](/static/images/help/stream-overview.png) ## Subscribing to streams 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 bdb671a801..4d92ef88a1 100644 --- a/templates/zerver/help/change-the-color-of-a-stream.md +++ b/templates/zerver/help/change-the-color-of-a-stream.md @@ -28,7 +28,7 @@ code for your stream's color, you should change the stream's colors through the 2. Select the stream you want to change the color of in the [Subscriptions](/#subscriptions) page; {!stream-settings.md!} -2. Under the **Stream Settings** section, select the **Stream color** option. +2. Under the **Stream settings** section, select the **Stream color** option. 3. In the tooltip that appears after selecting the **Stream color** option, select a color from the color palette. diff --git a/templates/zerver/help/include/stream-settings.md b/templates/zerver/help/include/stream-settings.md index 7d45313e2f..ab8124bf9c 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 [Subscriptions](/#subscriptions) page, labeled **Stream settings**, will now display the selected stream's settings. diff --git a/templates/zerver/help/pin-a-stream.md b/templates/zerver/help/pin-a-stream.md index 80af368198..869e804cab 100644 --- a/templates/zerver/help/pin-a-stream.md +++ b/templates/zerver/help/pin-a-stream.md @@ -26,7 +26,7 @@ If you want to pin multiple streams at once, you should pin streams through the 2. Select the stream you want to pin in the [Subscriptions](/#subscriptions) page; {!stream-settings.md!} -3. Select the **Pin stream to top of left sidebar** option in **Stream Settings**. +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 will be pinned the top of the **Streams** section, confirming the success of 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 9659c9e2ac..e8e3297e9c 100644 --- a/templates/zerver/help/set-notifications-for-a-single-stream.md +++ b/templates/zerver/help/set-notifications-for-a-single-stream.md @@ -15,6 +15,6 @@ On Zulip, you can set different notification settings for different streams. 4. You will be taken to the [Subscriptions](/#subscriptions) page; {!stream-settings.md!} -5. Under the **Stream Settings** section you can now toggle +5. Under the **Stream settings** section you can now toggle **Receive audible notifications** and **Receive desktop notifications** for that stream.