Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

web-stream-settings: Update strings for stream rename channel. 

Updates a chunk of translated strings that overlap between files,
with the streams settings overlay being the starting point for
finding these strings, to use channel instead of stream.

Part of stream to channel rename project.
This commit is contained in:
Lauryn Menard 2024-04-18 18:36:57 +02:00 committed by Tim Abbott
parent ba766a564a
commit d7f9f8333e
31 changed files with 102 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lib/capitalization.py
View File

@ -96,7 +96,7 @@ IGNORED_PHRASES = [
r"^deprecated$", r"^deprecated$",
# We want the similar text in the Private Messages section to have the same capitalization. # We want the similar text in the Private Messages section to have the same capitalization.
r"more conversations", r"more conversations",
r"back to streams", r"back to channels",
# Capital 'i' looks weird in reminders popover # Capital 'i' looks weird in reminders popover
r"in 1 hour", r"in 1 hour",
r"in 20 minutes", r"in 20 minutes",

2
web/e2e-tests/stream_create.test.ts
View File

@ -75,7 +75,7 @@ async function test_user_filter_ui(page: Page): Promise<void> {
} }
async function create_stream(page: Page): Promise<void> { async function create_stream(page: Page): Promise<void> {
await page.waitForSelector('xpath///*[text()="Create stream"]', {visible: true}); await page.waitForSelector('xpath///*[text()="Create channel"]', {visible: true});
await common.fill_form(page, "form#stream_creation_form", { await common.fill_form(page, "form#stream_creation_form", {
stream_name: "Puppeteer", stream_name: "Puppeteer",
stream_description: "Everything Puppeteer", stream_description: "Everything Puppeteer",

8
web/src/add_stream_options_popover.ts
View File

@ -31,8 +31,8 @@ export function initialize(): void {
popover_menus.on_show_prep(instance); popover_menus.on_show_prep(instance);
// When showing the popover menu, we want the // When showing the popover menu, we want the
// "Add streams" and the "Filter streams" tooltip // "Add channels" and the "Filter channels" tooltip
// to appear below the "Add streams" icon. // to appear below the "Add channels" icon.
const add_streams_tooltip: ReferenceElement | undefined = const add_streams_tooltip: ReferenceElement | undefined =
$("#add_streams_tooltip").get(0); $("#add_streams_tooltip").get(0);
assert(add_streams_tooltip !== undefined); assert(add_streams_tooltip !== undefined);
@ -55,9 +55,9 @@ export function initialize(): void {
instance.destroy(); instance.destroy();
popover_menus.popover_instances.stream_settings = null; popover_menus.popover_instances.stream_settings = null;
// After the popover menu is closed, we want the // After the popover menu is closed, we want the
// "Add streams" and the "Filter streams" tooltip // "Add channels" and the "Filter channels" tooltip
// to appear at it's original position that is // to appear at it's original position that is
// above the "Add streams" icon. // above the "Add channels" icon.
const add_streams_tooltip: ReferenceElement | undefined = const add_streams_tooltip: ReferenceElement | undefined =
$("#add_streams_tooltip").get(0); $("#add_streams_tooltip").get(0);
assert(add_streams_tooltip !== undefined); assert(add_streams_tooltip !== undefined);

4
web/src/compose_recipient.ts
View File

@ -131,7 +131,7 @@ export function get_posting_policy_error_message(): string {
const stream = sub_store.get(compose_state.selected_recipient_id); const stream = sub_store.get(compose_state.selected_recipient_id);
if (stream && !stream_data.can_post_messages_in_stream(stream)) { if (stream && !stream_data.can_post_messages_in_stream(stream)) {
return $t({ return $t({
defaultMessage: "You do not have permission to post in this stream.", defaultMessage: "You do not have permission to post in this channel.",
}); });
} }
return ""; return "";
@ -174,7 +174,7 @@ function update_recipient_label(stream_id?: number): void {
const stream = stream_id !== undefined ? stream_data.get_sub_by_id(stream_id) : undefined; const stream = stream_id !== undefined ? stream_data.get_sub_by_id(stream_id) : undefined;
if (stream === undefined) { if (stream === undefined) {
$("#compose_select_recipient_widget .dropdown_widget_value").text( $("#compose_select_recipient_widget .dropdown_widget_value").text(
$t({defaultMessage: "Select a stream"}), $t({defaultMessage: "Select a channel"}),
); );
} else { } else {
$("#compose_select_recipient_widget .dropdown_widget_value").html( $("#compose_select_recipient_widget .dropdown_widget_value").html(

8
web/src/compose_validate.ts
View File

@ -343,8 +343,8 @@ function show_stream_wildcard_warnings(opts: StreamWildcardOptions): void {
const stream_wildcard_html = render_stream_wildcard_warning({ const stream_wildcard_html = render_stream_wildcard_warning({
banner_type: compose_banner.WARNING, banner_type: compose_banner.WARNING,
subscriber_count, subscriber_count,
stream_name, channel_name: stream_name,
stream_wildcard_mention: opts.stream_wildcard_mention, wildcard_mention: opts.stream_wildcard_mention,
button_text, button_text,
hide_close_button: true, hide_close_button: true,
classname, classname,
@ -553,7 +553,7 @@ function validate_stream_message(scheduling_message: boolean): boolean {
const $banner_container = $("#compose_banners"); const $banner_container = $("#compose_banners");
if (stream_id === undefined) { if (stream_id === undefined) {
compose_banner.show_error_message( compose_banner.show_error_message(
$t({defaultMessage: "Please specify a stream."}), $t({defaultMessage: "Please specify a channel."}),
compose_banner.CLASSNAMES.missing_stream, compose_banner.CLASSNAMES.missing_stream,
$banner_container, $banner_container,
$("#compose_select_recipient_widget_wrapper"), $("#compose_select_recipient_widget_wrapper"),
@ -585,7 +585,7 @@ function validate_stream_message(scheduling_message: boolean): boolean {
if (!stream_data.can_post_messages_in_stream(sub)) { if (!stream_data.can_post_messages_in_stream(sub)) {
compose_banner.show_error_message( compose_banner.show_error_message(
$t({ $t({
defaultMessage: "You do not have permission to post in this stream.", defaultMessage: "You do not have permission to post in this channel.",
}), }),
compose_banner.CLASSNAMES.no_post_permissions, compose_banner.CLASSNAMES.no_post_permissions,
$banner_container, $banner_container,

2
web/src/gear_menu.js
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: Stream settings hash: Channel settings
hash: Settings hash: Settings
hash: Organization settings hash: Organization settings
link: Usage statistics link: Usage statistics

18
web/src/settings_config.ts
View File

@ -76,15 +76,15 @@ export const user_list_style_values = {
export const web_stream_unreads_count_display_policy_values = { export const web_stream_unreads_count_display_policy_values = {
all_streams: { all_streams: {
code: 1, code: 1,
description: $t({defaultMessage: "All streams"}), description: $t({defaultMessage: "All channels"}),
}, },
unmuted_streams: { unmuted_streams: {
code: 2, code: 2,
description: $t({defaultMessage: "Unmuted streams and topics"}), description: $t({defaultMessage: "Unmuted channels and topics"}),
}, },
no_streams: { no_streams: {
code: 3, code: 3,
description: $t({defaultMessage: "No streams"}), description: $t({defaultMessage: "No channels"}),
}, },
}; };
@ -585,7 +585,7 @@ export const notification_settings_labels = {
defaultMessage: "Automatically follow topics where I'm mentioned", defaultMessage: "Automatically follow topics where I'm mentioned",
}), }),
automatically_unmute_topics_in_muted_streams_policy: $t({ automatically_unmute_topics_in_muted_streams_policy: $t({
defaultMessage: "Automatically unmute topics in muted streams", defaultMessage: "Automatically unmute topics in muted channels",
}), }),
desktop_icon_count_display: $t({ desktop_icon_count_display: $t({
defaultMessage: "Unread count badge (appears in desktop sidebar and browser tab)", defaultMessage: "Unread count badge (appears in desktop sidebar and browser tab)",
@ -631,7 +631,7 @@ export const realm_user_settings_defaults_labels = {
defaultMessage: "Let recipients see when a user is typing direct messages", defaultMessage: "Let recipients see when a user is typing direct messages",
}), }),
realm_send_stream_typing_notifications: $t({ realm_send_stream_typing_notifications: $t({
defaultMessage: "Let recipients see when a user is typing stream messages", defaultMessage: "Let recipients see when a user is typing channel messages",
}), }),
}; };
@ -650,12 +650,12 @@ export const general_notifications_table_labels = {
"all_mentions", "all_mentions",
], ],
stream: { stream: {
is_muted: $t({defaultMessage: "Mute stream"}), is_muted: $t({defaultMessage: "Mute channel"}),
desktop_notifications: $t({defaultMessage: "Visual desktop notifications"}), desktop_notifications: $t({defaultMessage: "Visual desktop notifications"}),
audible_notifications: $t({defaultMessage: "Audible desktop notifications"}), audible_notifications: $t({defaultMessage: "Audible desktop notifications"}),
push_notifications: $t({defaultMessage: "Mobile notifications"}), push_notifications: $t({defaultMessage: "Mobile notifications"}),
email_notifications: $t({defaultMessage: "Email notifications"}), email_notifications: $t({defaultMessage: "Email notifications"}),
pin_to_top: $t({defaultMessage: "Pin stream to top of left sidebar"}), pin_to_top: $t({defaultMessage: "Pin channel to top of left sidebar"}),
wildcard_mentions_notify: $t({defaultMessage: "Notifications for @all/@everyone mentions"}), wildcard_mentions_notify: $t({defaultMessage: "Notifications for @all/@everyone mentions"}),
}, },
}; };
@ -849,7 +849,7 @@ export type AllNotifications = {
export const all_notifications = (settings_object: Settings): AllNotifications => ({ export const all_notifications = (settings_object: Settings): AllNotifications => ({
general_settings: [ general_settings: [
{ {
label: $t({defaultMessage: "Streams"}), label: $t({defaultMessage: "Channels"}),
notification_settings: get_notifications_table_row_data( notification_settings: get_notifications_table_row_data(
stream_notification_settings, stream_notification_settings,
settings_object, settings_object,
@ -966,7 +966,7 @@ export const user_topic_visibility_policy_values = {
}, },
inherit: { inherit: {
code: 0, code: 0,
description: $t({defaultMessage: "Default for stream"}), description: $t({defaultMessage: "Default for channel"}),
}, },
}; };

2
web/src/stream_popover.js
View File

@ -497,7 +497,7 @@ export async function build_move_topic_to_stream_popover(
const stream = stream_data.get_sub_by_id(stream_id); const stream = stream_data.get_sub_by_id(stream_id);
if (stream === undefined) { if (stream === undefined) {
$("#move_topic_to_stream_widget .dropdown_widget_value").text( $("#move_topic_to_stream_widget .dropdown_widget_value").text(
$t({defaultMessage: "Select a stream"}), $t({defaultMessage: "Select a channel"}),
); );
} else { } else {
$("#move_topic_to_stream_widget .dropdown_widget_value").html( $("#move_topic_to_stream_widget .dropdown_widget_value").html(

10
web/src/stream_settings_components.js
View File

@ -36,7 +36,9 @@ export const show_subs_pane = {
nothing_selected() { nothing_selected() {
$(".settings, #stream-creation").hide(); $(".settings, #stream-creation").hide();
$(".nothing-selected").show(); $(".nothing-selected").show();
$("#subscription_overlay .stream-info-title").text($t({defaultMessage: "Stream settings"})); $("#subscription_overlay .stream-info-title").text(
$t({defaultMessage: "Channel settings"}),
);
}, },
settings(sub) { settings(sub) {
$(".settings, #stream-creation").hide(); $(".settings, #stream-creation").hide();
@ -46,7 +48,7 @@ export const show_subs_pane = {
create_stream() { create_stream() {
$(".nothing-selected, .settings, #stream-creation").hide(); $(".nothing-selected, .settings, #stream-creation").hide();
$("#stream-creation").show(); $("#stream-creation").show();
$("#subscription_overlay .stream-info-title").text($t({defaultMessage: "Create stream"})); $("#subscription_overlay .stream-info-title").text($t({defaultMessage: "Create channel"}));
}, },
}; };
@ -140,8 +142,8 @@ export function ajaxSubscribe(stream, color, $stream_row) {
true_stream_name = res.already_subscribed[people.my_current_email()][0]; true_stream_name = res.already_subscribed[people.my_current_email()][0];
ui_report.success( ui_report.success(
$t_html( $t_html(
{defaultMessage: "Already subscribed to {stream}"}, {defaultMessage: "Already subscribed to {channel}"},
{stream: true_stream_name}, {channel: true_stream_name},
), ),
$(".stream_change_property_info"), $(".stream_change_property_info"),
); );

6
web/src/stream_settings_ui.js
View File

@ -261,7 +261,7 @@ export function add_sub_to_table(sub) {
function show_first_stream_created_modal(stream) { function show_first_stream_created_modal(stream) {
dialog_widget.launch({ dialog_widget.launch({
html_heading: $t_html( html_heading: $t_html(
{defaultMessage: "Stream <b><z-stream></z-stream></b> created!"}, {defaultMessage: "Channel <b><z-stream></z-stream></b> created!"},
{ {
"z-stream": () => render_inline_decorated_stream_name({stream}), "z-stream": () => render_inline_decorated_stream_name({stream}),
}, },
@ -604,7 +604,7 @@ export function setup_page(callback) {
child_wants_focus: true, child_wants_focus: true,
values: [ values: [
{label: $t({defaultMessage: "Subscribed"}), key: "subscribed"}, {label: $t({defaultMessage: "Subscribed"}), key: "subscribed"},
{label: $t({defaultMessage: "All streams"}), key: "all-streams"}, {label: $t({defaultMessage: "All channels"}), key: "all-streams"},
], ],
callback(_value, key) { callback(_value, key) {
switch_stream_tab(key); switch_stream_tab(key);
@ -842,7 +842,7 @@ export function toggle_view(event) {
if (event === "right_arrow" && stream_filter_tab === "Subscribed") { if (event === "right_arrow" && stream_filter_tab === "Subscribed") {
toggler.goto("all-streams"); toggler.goto("all-streams");
} else if (event === "left_arrow" && stream_filter_tab === "All streams") { } else if (event === "left_arrow" && stream_filter_tab === "All channels") {
toggler.goto("subscribed"); toggler.goto("subscribed");
} }
} }

14
web/src/user_profile.js
View File

@ -144,10 +144,10 @@ function reset_subscribe_widget() {
$("#user-profile-modal .add-subscription-button").prop("disabled", true); $("#user-profile-modal .add-subscription-button").prop("disabled", true);
settings_components.initialize_disable_btn_hint_popover( settings_components.initialize_disable_btn_hint_popover(
$("#user-profile-modal .add-subscription-button-wrapper"), $("#user-profile-modal .add-subscription-button-wrapper"),
$t({defaultMessage: "Select a stream to subscribe"}), $t({defaultMessage: "Select a channel to subscribe"}),
); );
$("#user_profile_subscribe_widget .dropdown_widget_value").text( $("#user_profile_subscribe_widget .dropdown_widget_value").text(
$t({defaultMessage: "Select a stream"}), $t({defaultMessage: "Select a channel"}),
); );
// There are two cases when the subscribe widget is reset: when the user_profile // There are two cases when the subscribe widget is reset: when the user_profile
// is setup (the object is null), or after subscribing of a user in the dropdown. // is setup (the object is null), or after subscribing of a user in the dropdown.
@ -435,7 +435,7 @@ export function show_user_profile(user, default_tab_key = "profile-tab") {
child_wants_focus: true, child_wants_focus: true,
values: [ values: [
{label: $t({defaultMessage: "Profile"}), key: "profile-tab"}, {label: $t({defaultMessage: "Profile"}), key: "profile-tab"},
{label: $t({defaultMessage: "Streams"}), key: "user-profile-streams-tab"}, {label: $t({defaultMessage: "Channels"}), key: "user-profile-streams-tab"},
{label: $t({defaultMessage: "User groups"}), key: "user-profile-groups-tab"}, {label: $t({defaultMessage: "User groups"}), key: "user-profile-groups-tab"},
], ],
callback(_name, key) { callback(_name, key) {
@ -909,13 +909,13 @@ export function initialize() {
let error_message; let error_message;
if (people.is_my_user_id(target_user_id)) { if (people.is_my_user_id(target_user_id)) {
error_message = $t( error_message = $t(
{defaultMessage: "Error in unsubscribing from #{stream_name}"}, {defaultMessage: "Error in unsubscribing from #{channel_name}"},
{stream_name: sub.name}, {channel_name: sub.name},
); );
} else { } else {
error_message = $t( error_message = $t(
{defaultMessage: "Error removing user from #{stream_name}"}, {defaultMessage: "Error removing user from #{channel_name}"},
{stream_name: sub.name}, {channel_name: sub.name},
); );
} }

2
web/src/user_topics_ui.js
View File

@ -34,7 +34,7 @@ export function handle_topic_updates(user_topic_event) {
if ($row.length) { if ($row.length) {
// If the row exists, update the status only. // If the row exists, update the status only.
// We don't call 'populate_list' in this case as it re-creates the panel (re-sorts by date updated + // We don't call 'populate_list' in this case as it re-creates the panel (re-sorts by date updated +
// removes topics with status set to 'Default for stream'), making it hard to review the changes // removes topics with status set to 'Default for channel'), making it hard to review the changes
// and undo if needed. // and undo if needed.
const $status = $row.find("select.settings_user_topic_visibility_policy"); const $status = $row.find("select.settings_user_topic_visibility_policy");
$status.val(visibility_policy); $status.val(visibility_policy);

2
web/styles/compose.css
View File

@ -1177,7 +1177,7 @@ textarea.new_message_textarea,
font-weight: lighter; font-weight: lighter;
} }
/* This is the "Select a stream" default message */ /* This is the "Select a channel" default message */
.text-warning { .text-warning {
color: inherit; color: inherit;
} }

2
web/styles/left_sidebar.css
View File

@ -1425,7 +1425,7 @@ li.topic-list-item {
/* TODO: Rewrite the show-more and show-less /* TODO: Rewrite the show-more and show-less
buttons as grids alongside the left sidebar buttons as grids alongside the left sidebar
header rewrites. The 12px left padding here header rewrites. The 12px left padding here
aligns the "back to streams" text with the aligns the "back to channels" text with the
DIRECT MESSAGES heading above, which itself DIRECT MESSAGES heading above, which itself
is offset -3 px to the left, but reserves is offset -3 px to the left, but reserves
15px for the arrow marker. 15px - 3px = 12px. */ 15px for the arrow marker. 15px - 3px = 12px. */

2
web/templates/compose_banner/stream_wildcard_warning.hbs
View File

@ -1,7 +1,7 @@
{{#> compose_banner }} {{#> compose_banner }}
<p class="banner_message"> <p class="banner_message">
{{#tr}} {{#tr}}
Are you sure you want to send @-mention notifications to the <strong>{subscriber_count}</strong> users subscribed to #{stream_name}? If not, please edit your message to remove the <strong>@{stream_wildcard_mention}</strong> mention. Are you sure you want to send @-mention notifications to the <strong>{subscriber_count}</strong> users subscribed to #{channel_name}? If not, please edit your message to remove the <strong>@{wildcard_mention}</strong> mention.
{{/tr}} {{/tr}}
</p> </p>
{{/compose_banner}} {{/compose_banner}}

2
web/templates/gear_menu_popover.hbs
View File

@ -57,7 +57,7 @@
<li class="link-item popover-menu-inner-list-item hidden-for-spectators"> <li class="link-item popover-menu-inner-list-item hidden-for-spectators">
<a href="#streams/subscribed" class="navigate-link-on-enter popover-menu-link"> <a href="#streams/subscribed" class="navigate-link-on-enter popover-menu-link">
<i class="popover-menu-icon zulip-icon zulip-icon-hash" aria-hidden="true"></i> <i class="popover-menu-icon zulip-icon zulip-icon-hash" aria-hidden="true"></i>
<span class="popover-menu-label">{{t 'Stream settings' }}</span> <span class="popover-menu-label">{{t 'Channel settings' }}</span>
</a> </a>
</li> </li>
<li class="link-item popover-menu-inner-list-item admin-menu-item hidden-for-spectators"> <li class="link-item popover-menu-inner-list-item admin-menu-item hidden-for-spectators">

20
web/templates/keyboard_shortcuts.hbs
View File

@ -13,7 +13,7 @@
<td><span class="hotkey"><kbd>Enter</kbd> or <kbd>R</kbd></span></td> <td><span class="hotkey"><kbd>Enter</kbd> or <kbd>R</kbd></span></td>
</tr> </tr>
<tr> <tr>
<td class="definition">{{t 'New stream message' }}</td> <td class="definition">{{t 'New channel message' }}</td>
<td><span class="hotkey"><kbd>C</kbd></span></td> <td><span class="hotkey"><kbd>C</kbd></span></td>
</tr> </tr>
<tr> <tr>
@ -82,7 +82,7 @@
<td><span class="hotkey"><kbd>Ctrl</kbd> + <kbd>K</kbd> or <kbd>/</kbd></span></td> <td><span class="hotkey"><kbd>Ctrl</kbd> + <kbd>K</kbd> or <kbd>/</kbd></span></td>
</tr> </tr>
<tr> <tr>
<td class="definition">{{t 'Filter streams' }}</td> <td class="definition">{{t 'Filter channels' }}</td>
<td><span class="hotkey"><kbd>Q</kbd></span></td> <td><span class="hotkey"><kbd>Q</kbd></span></td>
</tr> </tr>
<tr> <tr>
@ -144,7 +144,7 @@
<td><span class="hotkey"><kbd>S</kbd></span></td> <td><span class="hotkey"><kbd>S</kbd></span></td>
</tr> </tr>
<tr> <tr>
<td class="definition">{{t 'Go to stream from topic view' }}</td> <td class="definition">{{t 'Go to channel from topic view' }}</td>
<td><span class="hotkey"><kbd>S</kbd></span></td> <td><span class="hotkey"><kbd>S</kbd></span></td>
</tr> </tr>
<tr> <tr>
@ -164,7 +164,7 @@
<td><span class="hotkey"><kbd>P</kbd></span></td> <td><span class="hotkey"><kbd>P</kbd></span></td>
</tr> </tr>
<tr> <tr>
<td class="definition">{{t 'Cycle between stream views' }}</td> <td class="definition">{{t 'Cycle between channel views' }}</td>
<td><span class="hotkey"><kbd>Shift</kbd> + <kbd>A</kbd> or <kbd>Shift</kbd> + <kbd>D</kbd></span></td> <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>A</kbd> or <kbd>Shift</kbd> + <kbd>D</kbd></span></td>
</tr> </tr>
<tr> <tr>
@ -185,7 +185,7 @@
</tr> </tr>
</thead> </thead>
<tr> <tr>
<td class="definition">{{t 'New stream message' }}</td> <td class="definition">{{t 'New channel message' }}</td>
<td><span class="hotkey"><kbd>C</kbd></span></td> <td><span class="hotkey"><kbd>C</kbd></span></td>
</tr> </tr>
<tr> <tr>
@ -368,11 +368,11 @@
<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 'Stream settings' }}</th> <th colspan="2">{{t 'Channel settings' }}</th>
</tr> </tr>
</thead> </thead>
<tr> <tr>
<td class="definition">{{t 'Scroll through streams' }}</td> <td class="definition">{{t 'Scroll through channels' }}</td>
<td><span class="hotkey"><kbd class="arrow-key">↑</kbd> or <kbd class="arrow-key">↓</kbd></span></td> <td><span class="hotkey"><kbd class="arrow-key">↑</kbd> or <kbd class="arrow-key">↓</kbd></span></td>
</tr> </tr>
<tr> <tr>
@ -380,15 +380,15 @@
<td><span class="hotkey"><kbd class="arrow-key">←</kbd> or <kbd class="arrow-key">→</kbd></span></td> <td><span class="hotkey"><kbd class="arrow-key">←</kbd> or <kbd class="arrow-key">→</kbd></span></td>
</tr> </tr>
<tr> <tr>
<td class="definition">{{t 'View stream messages' }}</td> <td class="definition">{{t 'View channel messages' }}</td>
<td><span class="hotkey"><kbd>Shift</kbd> + <kbd>V</kbd></span></td> <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>V</kbd></span></td>
</tr> </tr>
<tr> <tr>
<td class="definition">{{t 'Subscribe to/unsubscribe from selected stream' }}</td> <td class="definition">{{t 'Subscribe to/unsubscribe from selected channel' }}</td>
<td><span class="hotkey"><kbd>Shift</kbd> + <kbd>S</kbd></span></td> <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>S</kbd></span></td>
</tr> </tr>
<tr> <tr>
<td class="definition">{{t 'Create new stream' }}</td> <td class="definition">{{t 'Create new channel' }}</td>
<td><span class="hotkey"><kbd>N</kbd></span></td> <td><span class="hotkey"><kbd>N</kbd></span></td>
</tr> </tr>
</table> </table>

12
web/templates/left_sidebar.hbs
View File

@ -147,7 +147,7 @@
</div> </div>
</div> </div>
<a class="zoom-out-hide" id="hide-more-direct-messages"> <a class="zoom-out-hide" id="hide-more-direct-messages">
<span> {{t 'back to streams' }}</span> <span> {{t 'back to channels' }}</span>
</a> </a>
</div> </div>
{{~!-- squash whitespace --~}} {{~!-- squash whitespace --~}}
@ -158,10 +158,10 @@
<div id="streams_list" class="zoom-out"> <div id="streams_list" class="zoom-out">
<div id="streams_header" class="zoom-in-hide {{#if hide_unread_counts}}hide_unread_counts{{/if}}"> <div id="streams_header" class="zoom-in-hide {{#if hide_unread_counts}}hide_unread_counts{{/if}}">
<h4 class="left-sidebar-title"><span class="streams-tooltip-target" data-tooltip-template-id="filter-streams-tooltip-template">{{t 'STREAMS' }}</span></h4> <h4 class="left-sidebar-title"><span class="streams-tooltip-target" data-tooltip-template-id="filter-streams-tooltip-template">{{t 'CHANNELS' }}</span></h4>
<div class="heading-markers-and-controls"> <div class="heading-markers-and-controls">
<i id="filter_streams_tooltip" class="streams_filter_icon fa fa-filter" aria-hidden="true" data-tooltip-template-id="filter-streams-tooltip-template"></i> <i id="filter_streams_tooltip" class="streams_filter_icon fa fa-filter" aria-hidden="true" data-tooltip-template-id="filter-streams-tooltip-template"></i>
<span id="add_streams_tooltip" class="hidden-for-spectators" data-tippy-content="{{t 'Add streams' }}"> <span id="add_streams_tooltip" class="hidden-for-spectators" data-tippy-content="{{t 'Add channels' }}">
<i id="streams_inline_icon" class='fa fa-plus' aria-hidden="true" ></i> <i id="streams_inline_icon" class='fa fa-plus' aria-hidden="true" ></i>
</span> </span>
<span class="unread_count"></span> <span class="unread_count"></span>
@ -169,14 +169,14 @@
</div> </div>
<div class="input-append notdisplayed stream_search_section"> <div class="input-append notdisplayed stream_search_section">
<input class="stream-list-filter home-page-input filter_text_input" type="text" autocomplete="off" placeholder="{{t 'Filter streams' }}" /> <input class="stream-list-filter home-page-input filter_text_input" type="text" autocomplete="off" placeholder="{{t 'Filter channels' }}" />
<button type="button" class="btn clear_search_button" id="clear_search_stream_button"> <button type="button" class="btn clear_search_button" id="clear_search_stream_button">
<i class="fa fa-remove" aria-hidden="true"></i> <i class="fa fa-remove" aria-hidden="true"></i>
</button> </button>
</div> </div>
</div> </div>
<div id="topics_header"> <div id="topics_header">
<a class="show-all-streams" tabindex="0">{{t 'Back to streams' }}</a> <span class="unread_count"></span> <a class="show-all-streams" tabindex="0">{{t 'Back to channels' }}</a> <span class="unread_count"></span>
</div> </div>
<div id="stream-filters-container"> <div id="stream-filters-container">
<ul id="stream_filters" class="filters"></ul> <ul id="stream_filters" class="filters"></ul>
@ -187,7 +187,7 @@
<a class="login_button"> <a class="login_button">
<i class="zulip-icon zulip-icon-log-in" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-log-in" aria-hidden="true"></i>
{{~!-- squash whitespace --~}} {{~!-- squash whitespace --~}}
{{t 'Log in to browse more streams'}} {{t 'Log in to browse more channels'}}
</a> </a>
</div> </div>
</div> </div>

4
web/templates/popovers/left_sidebar_stream_setting_popover.hbs
View File

@ -1,12 +1,12 @@
<ul class="nav nav-list"> <ul class="nav nav-list">
<li> <li>
<a href="#streams/all" class="navigate_and_close_popover"> <a href="#streams/all" class="navigate_and_close_popover">
{{t "Browse streams" }} {{t "Browse channels" }}
</a> </a>
</li> </li>
<li> <li>
<a href="#streams/new" class="navigate_and_close_popover"> <a href="#streams/new" class="navigate_and_close_popover">
{{t "Create a stream" }} {{t "Create a channel" }}
</a> </a>
</li> </li>
</ul> </ul>

2
web/templates/popovers/mobile_message_buttons_popover.hbs
View File

@ -3,7 +3,7 @@
<a class="compose_mobile_stream_button"> <a class="compose_mobile_stream_button">
<i class="fa fa-bullhorn" aria-hidden="true"></i> <i class="fa fa-bullhorn" aria-hidden="true"></i>
{{#if is_in_private_narrow }} {{#if is_in_private_narrow }}
{{t "New stream message" }} {{t "New channel message" }}
{{else}} {{else}}
{{t "New topic" }} {{t "New topic" }}
{{/if}} {{/if}}

2
web/templates/settings/bot_avatar_row.hbs
View File

@ -17,7 +17,7 @@
<button type="submit" class="btn deactivate_bot danger-red tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Deactivate bot' }}" data-user-id="{{user_id}}"> <button type="submit" class="btn deactivate_bot danger-red tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Deactivate bot' }}" data-user-id="{{user_id}}">
<i class="fa fa-user-times" aria-hidden="true"></i> <i class="fa fa-user-times" aria-hidden="true"></i>
</button> </button>
<button type="submit" class="btn open_bots_subscribed_streams tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Subscribed streams' }}" data-user-id="{{user_id}}"> <button type="submit" class="btn open_bots_subscribed_streams tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Subscribed channels' }}" data-user-id="{{user_id}}">
<i class="fa fa-hashtag purple" aria-hidden="true"></i> <i class="fa fa-hashtag purple" aria-hidden="true"></i>
</button> </button>
{{#if is_incoming_webhook_bot}} {{#if is_incoming_webhook_bot}}

10
web/templates/settings/default_streams_list_admin.hbs
View File

@ -1,13 +1,13 @@
<div id="admin-default-streams-list" class="settings-section" data-name="default-streams-list"> <div id="admin-default-streams-list" class="settings-section" data-name="default-streams-list">
<p>{{t "Configure the default streams new users are subscribed to when joining your organization." }}</p> <p>{{t "Configure the default channels new users are subscribed to when joining your organization." }}</p>
<div class="settings_panel_list_header"> <div class="settings_panel_list_header">
<h3>{{t "Default streams"}}</h3> <h3>{{t "Default channels"}}</h3>
<div class="add_default_streams_button_container"> <div class="add_default_streams_button_container">
{{#if is_admin}} {{#if is_admin}}
<button type="submit" id="show-add-default-streams-modal" class="button rounded sea-green">{{t "Add stream" }}</button> <button type="submit" id="show-add-default-streams-modal" class="button rounded sea-green">{{t "Add channel" }}</button>
{{/if}} {{/if}}
<input type="text" class="search filter_text_input" placeholder="{{t 'Filter default streams' }}" aria-label="{{t 'Filter streams' }}"/> <input type="text" class="search filter_text_input" placeholder="{{t 'Filter default channels' }}" aria-label="{{t 'Filter channels' }}"/>
</div> </div>
</div> </div>
@ -19,7 +19,7 @@
<th class="actions">{{t "Actions" }}</th> <th class="actions">{{t "Actions" }}</th>
{{/if}} {{/if}}
</thead> </thead>
<tbody data-empty="{{t 'There are no default streams.' }}" data-search-results-empty="{{t 'No default streams match your current filter.' }}" <tbody data-empty="{{t 'There are no default channels.' }}" data-search-results-empty="{{t 'No default channels match your current filter.' }}"
id="admin_default_streams_table" class="admin_default_stream_table"></tbody> id="admin_default_streams_table" class="admin_default_stream_table"></tbody>
</table> </table>
</div> </div>

2
web/templates/settings_overlay.hbs
View File

@ -126,7 +126,7 @@
{{#unless is_guest}} {{#unless is_guest}}
<li class="collapse-org-settings {{#unless is_admin}}hide-org-settings{{/unless}}" tabindex="0" data-section="default-streams-list"> <li class="collapse-org-settings {{#unless is_admin}}hide-org-settings{{/unless}}" tabindex="0" data-section="default-streams-list">
<i class="icon fa fa-exchange" aria-hidden="true"></i> <i class="icon fa fa-exchange" aria-hidden="true"></i>
<div class="text">{{t "Default streams" }}</div> <div class="text">{{t "Default channels" }}</div>
{{#unless is_admin}} {{#unless is_admin}}
<i class="locked fa fa-lock tippy-zulip-tooltip" data-tippy-content="{{t 'Only organization administrators can edit these settings.' }}"></i> <i class="locked fa fa-lock tippy-zulip-tooltip" data-tippy-content="{{t 'Only organization administrators can edit these settings.' }}"></i>
{{/unless}} {{/unless}}

18
web/templates/stream_settings/stream_settings_overlay.hbs
View File

@ -3,7 +3,7 @@
<div class="subscriptions-container overlay-container"> <div class="subscriptions-container overlay-container">
<div class="subscriptions-header"> <div class="subscriptions-header">
<div class="fa fa-chevron-left"></div> <div class="fa fa-chevron-left"></div>
<span class="subscriptions-title">{{t 'Streams' }}</span> <span class="subscriptions-title">{{t 'Channels' }}</span>
<div class="exit"> <div class="exit">
<span class="exit-sign">&times;</span> <span class="exit-sign">&times;</span>
</div> </div>
@ -21,7 +21,7 @@
</div> </div>
<div class="input-append stream_name_search_section" id="stream_filter"> <div class="input-append stream_name_search_section" id="stream_filter">
<input type="text" name="stream_name" id="search_stream_name" class="filter_text_input" autocomplete="off" <input type="text" name="stream_name" id="search_stream_name" class="filter_text_input" autocomplete="off"
placeholder="{{t 'Filter streams' }}" value=""/> placeholder="{{t 'Filter channels' }}" value=""/>
<button type="button" class="btn clear_search_button" id="clear_search_stream_name"> <button type="button" class="btn clear_search_button" id="clear_search_stream_name">
<i class="fa fa-remove" aria-hidden="true"></i> <i class="fa fa-remove" aria-hidden="true"></i>
</button> </button>
@ -29,17 +29,17 @@
<div class="no-streams-to-show"> <div class="no-streams-to-show">
<div class="subscribed_streams_tab_empty_text"> <div class="subscribed_streams_tab_empty_text">
<span> <span>
{{t 'You are not subscribed to any streams.'}} {{t 'You are not subscribed to any channels.'}}
{{#if can_view_all_streams}} {{#if can_view_all_streams}}
<a href="#streams/all">{{t 'View all streams'}}</a> <a href="#streams/all">{{t 'View all channels'}}</a>
{{/if}} {{/if}}
</span> </span>
</div> </div>
<div class="all_streams_tab_empty_text"> <div class="all_streams_tab_empty_text">
<span> <span>
{{t 'There are no streams you can view in this organization.'}} {{t 'There are no channels you can view in this organization.'}}
{{#if can_create_streams}} {{#if can_create_streams}}
<a href="#streams/new">{{t 'Create a stream'}}</a> <a href="#streams/new">{{t 'Create a channel'}}</a>
{{/if}} {{/if}}
</span> </span>
</div> </div>
@ -49,14 +49,14 @@
</div> </div>
<div class="right"> <div class="right">
<div class="display-type"> <div class="display-type">
<div id="stream_settings_title" class="stream-info-title">{{t 'Stream settings' }}</div> <div id="stream_settings_title" class="stream-info-title">{{t 'Channel settings' }}</div>
</div> </div>
<div class="nothing-selected"> <div class="nothing-selected">
{{#if can_create_streams}} {{#if can_create_streams}}
<button type="button" class="create_stream_button animated-purple-button">{{t 'Create stream' }}</button> <button type="button" class="create_stream_button animated-purple-button">{{t 'Create channel' }}</button>
<span> <span>
{{#tr}} {{#tr}}
First time? Read our <z-link>guidelines</z-link> for creating and naming streams. First time? Read our <z-link>guidelines</z-link> for creating and naming channels.
{{#*inline "z-link"}}<a href="/help/getting-your-organization-started-with-zulip#create-streams" target="_blank" rel="noopener noreferrer">{{> @partial-block}}</a>{{/inline}} {{#*inline "z-link"}}<a href="/help/getting-your-organization-started-with-zulip#create-streams" target="_blank" rel="noopener noreferrer">{{> @partial-block}}</a>{{/inline}}
{{/tr}} {{/tr}}
</span> </span>

10
web/templates/stream_sidebar_actions.hbs
View File

@ -17,16 +17,16 @@
<li class="stream-menu-item"> <li class="stream-menu-item">
<a tabindex="0" class="open_stream_settings"> <a tabindex="0" class="open_stream_settings">
<i class="fa fa-cog" aria-hidden="true"></i> <i class="fa fa-cog" aria-hidden="true"></i>
{{t "Stream settings" }} {{t "Channel settings" }}
</a> </a>
</li> </li>
<li class="stream-menu-item hidden-for-spectators"> <li class="stream-menu-item hidden-for-spectators">
<a tabindex="0" class="pin_to_top"> <a tabindex="0" class="pin_to_top">
<i class="fa fa-thumb-tack stream-pin-icon" aria-hidden="true"></i> <i class="fa fa-thumb-tack stream-pin-icon" aria-hidden="true"></i>
{{#if stream.pin_to_top}} {{#if stream.pin_to_top}}
{{t "Unpin stream from top"}} {{t "Unpin channel from top"}}
{{else}} {{else}}
{{t "Pin stream to top"}} {{t "Pin channel to top"}}
{{/if}} {{/if}}
</a> </a>
</li> </li>
@ -40,10 +40,10 @@
<a tabindex="0" class="toggle_stream_muted"> <a tabindex="0" class="toggle_stream_muted">
{{#if stream.is_muted}} {{#if stream.is_muted}}
<i class="zulip-icon zulip-icon-mute" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-mute" aria-hidden="true"></i>
{{t "Unmute stream"}} {{t "Unmute channel"}}
{{else}} {{else}}
<i class="zulip-icon zulip-icon-mute" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-mute" aria-hidden="true"></i>
{{t "Mute stream"}} {{t "Mute channel"}}
{{/if}} {{/if}}
</a> </a>
</li> </li>

6
web/templates/subscribe_to_more_streams.hbs
View File

@ -1,16 +1,16 @@
{{#if exactly_one_unsubscribed_stream}} {{#if exactly_one_unsubscribed_stream}}
<a href="#streams/all"> <a href="#streams/all">
<i class="fa fa-plus-circle" aria-hidden="true"></i> <i class="fa fa-plus-circle" aria-hidden="true"></i>
{{~t "Browse 1 more stream" ~}} {{~t "Browse 1 more channel" ~}}
</a> </a>
{{else if can_subscribe_stream_count}} {{else if can_subscribe_stream_count}}
<a href="#streams/all"> <a href="#streams/all">
<i class="fa fa-plus-circle" aria-hidden="true"></i> <i class="fa fa-plus-circle" aria-hidden="true"></i>
{{~t "Browse {can_subscribe_stream_count} more streams" ~}} {{~t "Browse {can_subscribe_stream_count} more channels" ~}}
</a> </a>
{{else if can_create_streams}} {{else if can_create_streams}}
<a href="#streams/new"> <a href="#streams/new">
<i class="fa fa-plus-circle" aria-hidden="true"></i> <i class="fa fa-plus-circle" aria-hidden="true"></i>
{{~t "Create a stream" ~}} {{~t "Create a channel" ~}}
</a> </a>
{{/if}} {{/if}}

10
web/templates/tooltip_templates.hbs
View File

@ -30,7 +30,7 @@
{{tooltip_hotkey_hints "C"}} {{tooltip_hotkey_hints "C"}}
</template> </template>
<template id="new_stream_message_button_tooltip_template"> <template id="new_stream_message_button_tooltip_template">
{{t 'New stream message' }} {{t 'New channel message' }}
{{tooltip_hotkey_hints "C"}} {{tooltip_hotkey_hints "C"}}
</template> </template>
<template id="new_direct_message_button_tooltip_template"> <template id="new_direct_message_button_tooltip_template">
@ -127,7 +127,7 @@
{{t 'Starred messages' }} {{t 'Starred messages' }}
</template> </template>
<template id="filter-streams-tooltip-template"> <template id="filter-streams-tooltip-template">
{{t 'Filter streams' }} {{t 'Filter channels' }}
{{tooltip_hotkey_hints "Q"}} {{tooltip_hotkey_hints "Q"}}
</template> </template>
<template id="message-expander-tooltip-template"> <template id="message-expander-tooltip-template">
@ -183,7 +183,7 @@
{{tooltip_hotkey_hints "/"}} {{tooltip_hotkey_hints "/"}}
</template> </template>
<template id="streamlist-toggle-tooltip-template" > <template id="streamlist-toggle-tooltip-template" >
{{t 'View streams' }} {{t 'View channels' }}
{{tooltip_hotkey_hints "Q"}} {{tooltip_hotkey_hints "Q"}}
</template> </template>
<template id="show-userlist-tooltip-template"> <template id="show-userlist-tooltip-template">
@ -210,7 +210,7 @@
{{tooltip_hotkey_hints "Backspace"}} {{tooltip_hotkey_hints "Backspace"}}
</template> </template>
<template id="create-new-stream-tooltip-template"> <template id="create-new-stream-tooltip-template">
{{t 'Create new stream' }} {{t 'Create new channel' }}
{{tooltip_hotkey_hints "N"}} {{tooltip_hotkey_hints "N"}}
</template> </template>
<template id="toggle-subscription-tooltip-template"> <template id="toggle-subscription-tooltip-template">
@ -218,7 +218,7 @@
{{tooltip_hotkey_hints "Shift" "S"}} {{tooltip_hotkey_hints "Shift" "S"}}
</template> </template>
<template id="view-stream-tooltip-template"> <template id="view-stream-tooltip-template">
{{t 'View stream' }} {{t 'View channel' }}
{{tooltip_hotkey_hints "Shift" "V"}} {{tooltip_hotkey_hints "Shift" "V"}}
</template> </template>
<template id="mobile-push-notification-tooltip-template"> <template id="mobile-push-notification-tooltip-template">

8
web/templates/user_profile_modal.hbs
View File

@ -105,21 +105,21 @@
<div class="alert stream_list_info"></div> <div class="alert stream_list_info"></div>
{{#if show_user_subscribe_widget}} {{#if show_user_subscribe_widget}}
<div class="header-section"> <div class="header-section">
<h3 class="stream-tab-element-header">{{t 'Subscribe {full_name} to streams'}}</h3> <h3 class="stream-tab-element-header">{{t 'Subscribe {full_name} to channels'}}</h3>
</div> </div>
{{> user_profile_subscribe_widget}} {{> user_profile_subscribe_widget}}
{{/if}} {{/if}}
<div class="stream-list-top-section"> <div class="stream-list-top-section">
<div class="header-section"> <div class="header-section">
<h3 class="stream-tab-element-header">{{t 'Subscribed streams' }}</h3> <h3 class="stream-tab-element-header">{{t 'Subscribed channels' }}</h3>
</div> </div>
<input type="text" class="stream-search modal_text_input" placeholder="{{t 'Filter streams' }}" /> <input type="text" class="stream-search modal_text_input" placeholder="{{t 'Filter channels' }}" />
<button type="button" class="clear_search_button" id="clear_stream_search"> <button type="button" class="clear_search_button" id="clear_stream_search">
<i class="fa fa-remove" aria-hidden="true"></i> <i class="fa fa-remove" aria-hidden="true"></i>
</button> </button>
</div> </div>
<div class="subscription-stream-list empty-list"> <div class="subscription-stream-list empty-list">
<table class="user-stream-list" data-empty="{{t 'No stream subscriptions.'}}" data-search-results-empty="{{t 'No matching streams' }}"></table> <table class="user-stream-list" data-empty="{{t 'No channel subscriptions.'}}" data-search-results-empty="{{t 'No matching channels' }}"></table>
</div> </div>
</div> </div>

8
web/tests/compose_validate.test.js
View File

@ -235,7 +235,7 @@ test_ui("validate", ({mock_template}) => {
let empty_stream_error_rendered = false; let empty_stream_error_rendered = false;
mock_template("compose_banner/compose_banner.hbs", false, (data) => { mock_template("compose_banner/compose_banner.hbs", false, (data) => {
assert.equal(data.classname, compose_banner.CLASSNAMES.missing_stream); assert.equal(data.classname, compose_banner.CLASSNAMES.missing_stream);
assert.equal(data.banner_text, $t({defaultMessage: "Please specify a stream."})); assert.equal(data.banner_text, $t({defaultMessage: "Please specify a channel."}));
empty_stream_error_rendered = true; empty_stream_error_rendered = true;
return "<banner-stub>"; return "<banner-stub>";
}); });
@ -428,7 +428,7 @@ test_ui("test_validate_stream_message_post_policy_admin_only", ({mock_template})
assert.equal( assert.equal(
data.banner_text, data.banner_text,
$t({ $t({
defaultMessage: "You do not have permission to post in this stream.", defaultMessage: "You do not have permission to post in this channel.",
}), }),
); );
banner_rendered = true; banner_rendered = true;
@ -473,7 +473,7 @@ test_ui("test_validate_stream_message_post_policy_moderators_only", ({mock_templ
assert.equal( assert.equal(
data.banner_text, data.banner_text,
$t({ $t({
defaultMessage: "You do not have permission to post in this stream.", defaultMessage: "You do not have permission to post in this channel.",
}), }),
); );
banner_rendered = true; banner_rendered = true;
@ -509,7 +509,7 @@ test_ui("test_validate_stream_message_post_policy_full_members_only", ({mock_tem
assert.equal( assert.equal(
data.banner_text, data.banner_text,
$t({ $t({
defaultMessage: "You do not have permission to post in this stream.", defaultMessage: "You do not have permission to post in this channel.",
}), }),
); );
banner_rendered = true; banner_rendered = true;

2
web/tests/i18n.test.js
View File

@ -111,7 +111,7 @@ run_test("tr_tag", ({mock_template}) => {
twenty_four_hour_time: "Time format", twenty_four_hour_time: "Time format",
automatically_follow_topics_policy: "Automatically follow topics", automatically_follow_topics_policy: "Automatically follow topics",
automatically_unmute_topics_in_muted_streams_policy: automatically_unmute_topics_in_muted_streams_policy:
"Automatically unmute topics in muted streams", "Automatically unmute topics in muted channels",
automatically_follow_topics_where_mentioned: automatically_follow_topics_where_mentioned:
"Automatically follow topics where I'm mentioned", "Automatically follow topics where I'm mentioned",
}, },

2
web/tests/settings_config.test.js
View File

@ -43,7 +43,7 @@ run_test("all_notifications", () => {
assert.deepEqual(notifications.general_settings, [ assert.deepEqual(notifications.general_settings, [
{ {
label: "translated: Streams", label: "translated: Channels",
notification_settings: [ notification_settings: [
{ {
is_checked: false, is_checked: false,