gear_menu: Rename "Manage streams" -> "Stream settings".

Fixes #27754.
This commit is contained in:
David 2023-11-17 08:53:41 -08:00 committed by GitHub
parent c71f62089b
commit 81f99dde55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 16 additions and 16 deletions

View File

@ -446,7 +446,7 @@ Test subscribe/unsubscribe:
- Log in as Hamlet and go to his stream settings. - Log in as Hamlet and go to his stream settings.
- As Cordelia, unsubscribe from "public1" using the checkmark in the - As Cordelia, unsubscribe from "public1" using the checkmark in the
streams settings page. stream settings page.
- Verify that Hamlet sees that Cordelia has unsubscribed (and the - Verify that Hamlet sees that Cordelia has unsubscribed (and the
subscriber count should decrement). subscriber count should decrement).
- As Cordelia, resubscribe to "public1." - As Cordelia, resubscribe to "public1."

View File

@ -209,8 +209,8 @@ properly capitalized in a way consistent with how Zulip does
capitalization in general. This means that: capitalization in general. This means that:
- The first letter of a sentence or phrase should be capitalized. - The first letter of a sentence or phrase should be capitalized.
- Correct: "Manage streams" - Correct: "Stream settings"
- Incorrect: "Manage Streams" - Incorrect: "Stream Settings"
- All proper nouns should be capitalized. - All proper nouns should be capitalized.
- Correct: "This is Zulip" - Correct: "This is Zulip"
- Incorrect: "This is zulip" - Incorrect: "This is zulip"

View File

@ -12,7 +12,7 @@ in the Zulip app to add more to your repertoire as needed.
* [Message actions](#message-actions) * [Message actions](#message-actions)
* [Drafts](#drafts) * [Drafts](#drafts)
* [Menus](#menus) * [Menus](#menus)
* [Streams settings](#streams-settings-page) * [Stream settings](#stream-settings)
## The basics ## The basics
@ -213,7 +213,7 @@ Keyboard navigation (e.g. arrow keys) works as expected.
* **Toggle message actions menu**: <kbd>I</kbd> * **Toggle message actions menu**: <kbd>I</kbd>
## Streams settings page ## Stream settings
* **Scroll through streams**: <kbd class="arrow-key"></kbd> and * **Scroll through streams**: <kbd class="arrow-key"></kbd> and
<kbd class="arrow-key"></kbd> <kbd class="arrow-key"></kbd>

View File

@ -22,7 +22,7 @@ You can always unsubscribe from any stream in Zulip.
## Alternate methods to unsubscribe from a stream ## Alternate methods to unsubscribe from a stream
### Via manage streams ### Via subscribed streams
{start_tabs} {start_tabs}

View File

@ -16,7 +16,7 @@ export function initialize() {
if (!can_create_streams) { if (!can_create_streams) {
// If the user can't create streams, we directly // If the user can't create streams, we directly
// navigate them to the Manage streams subscribe UI. // navigate them to the Stream settings subscribe UI.
window.location.assign("#streams/all"); window.location.assign("#streams/all");
// Returning false from an onShow handler cancels the show. // Returning false from an onShow handler cancels the show.
return false; return false;

View File

@ -25,7 +25,7 @@ actually do much of the work.
Our gear menu has these choices: Our gear menu has these choices:
================= =================
hash: Manage streams hash: Stream settings
hash: Settings hash: Settings
hash: Organization settings hash: Organization settings
link: Usage statistics link: Usage statistics

View File

@ -523,7 +523,7 @@ export function setup_page(callback) {
// so it's too risky a change for now. // so it's too risky a change for now.
// //
// The history behind setting up the page from scratch every // The history behind setting up the page from scratch every
// time we go into "Manage streams" is that we used to have // time we go into "Stream settings" is that we used to have
// some live-update issues, so being able to re-launch the // some live-update issues, so being able to re-launch the
// streams page is kind of a workaround for those bugs, since // streams page is kind of a workaround for those bugs, since
// we will re-populate the widget. // we will re-populate the widget.
@ -532,7 +532,7 @@ export function setup_page(callback) {
// continue the strategy that we re-render everything from scratch. // continue the strategy that we re-render everything from scratch.
// Also, we'll always go back to the "Subscribed" tab. // Also, we'll always go back to the "Subscribed" tab.
function initialize_components() { function initialize_components() {
// Sort by name by default when opening "Manage streams". // Sort by name by default when opening "Stream settings".
sort_order = "by-stream-name"; sort_order = "by-stream-name";
const sort_toggler = components.toggle({ const sort_toggler = components.toggle({
values: [ values: [
@ -564,7 +564,7 @@ export function setup_page(callback) {
$("#streams_overlay_container .list-toggler-container").prepend(sort_toggler.get()); $("#streams_overlay_container .list-toggler-container").prepend(sort_toggler.get());
// Reset our internal state to reflect that we're initially in // Reset our internal state to reflect that we're initially in
// the "Subscribed" tab if we're reopening "Manage streams". // the "Subscribed" tab if we're reopening "Stream settings".
stream_ui_updates.set_subscribed_only(true); stream_ui_updates.set_subscribed_only(true);
toggler = components.toggle({ toggler = components.toggle({
child_wants_focus: true, child_wants_focus: true,

View File

@ -56,7 +56,7 @@
<ul class="navbar-dropdown-menu-inner-list"> <ul class="navbar-dropdown-menu-inner-list">
<li class="link-item navbar-dropdown-menu-inner-list-item hidden-for-spectators"> <li class="link-item navbar-dropdown-menu-inner-list-item hidden-for-spectators">
<a href="#streams/subscribed" class="navigate-link-on-enter navbar-dropdown-menu-link"> <a href="#streams/subscribed" class="navigate-link-on-enter navbar-dropdown-menu-link">
<i class="navbar-dropdown-icon zulip-icon zulip-icon-hash" aria-hidden="true"></i> {{t 'Manage streams' }} <i class="navbar-dropdown-icon zulip-icon zulip-icon-hash" aria-hidden="true"></i> {{t 'Stream settings' }}
</a> </a>
</li> </li>
<li class="link-item navbar-dropdown-menu-inner-list-item hidden-for-spectators"> <li class="link-item navbar-dropdown-menu-inner-list-item hidden-for-spectators">

View File

@ -343,7 +343,7 @@
<table class="hotkeys_table table table-striped table-bordered"> <table class="hotkeys_table table table-striped table-bordered">
<thead> <thead>
<tr> <tr>
<th colspan="2">{{t 'Streams settings' }}</th> <th colspan="2">{{t 'Stream settings' }}</th>
</tr> </tr>
</thead> </thead>
<tr> <tr>

View File

@ -19,7 +19,7 @@ gear_info = {
# key is from REGEXP: `{relative|gear|key}` # key is from REGEXP: `{relative|gear|key}`
# name is what the item is called in the gear menu: `Select **name**.` # name is what the item is called in the gear menu: `Select **name**.`
# link is used for relative links: `Select [name](link).` # link is used for relative links: `Select [name](link).`
"manage-streams": ['<i class="fa fa-exchange"></i> Manage streams', "/#streams/subscribed"], "stream-settings": ['<i class="fa fa-exchange"></i> Stream settings', "/#streams/subscribed"],
"settings": ['<i class="fa fa-wrench"></i> Personal Settings', "/#settings/profile"], "settings": ['<i class="fa fa-wrench"></i> Personal Settings', "/#settings/profile"],
"organization-settings": [ "organization-settings": [
'<i class="fa fa-bolt"></i> Organization settings', '<i class="fa fa-bolt"></i> Organization settings',
@ -92,7 +92,7 @@ stream_instructions_no_link = """
1. Click on the **gear** (<i class="fa fa-cog"></i>) icon in the upper 1. Click on the **gear** (<i class="fa fa-cog"></i>) icon in the upper
right corner of the web or desktop app. right corner of the web or desktop app.
1. Click **Manage streams**. 1. Click **Stream settings**.
""" """

View File

@ -429,7 +429,7 @@ class HelpTest(ZulipTestCase):
with self.settings(ROOT_DOMAIN_LANDING_PAGE=True): with self.settings(ROOT_DOMAIN_LANDING_PAGE=True):
result = self.client_get("/help/message-a-stream-by-email", subdomain="") result = self.client_get("/help/message-a-stream-by-email", subdomain="")
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
self.assertIn("<strong>Manage streams</strong>", str(result.content)) self.assertIn("<strong>Stream settings</strong>", str(result.content))
self.assertNotIn("/#streams", str(result.content)) self.assertNotIn("/#streams", str(result.content))