paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_data: Rephrase descriptions of stream permissons.

Browse Source 
The previous phrasing used incorrect terminology (E.g. "stream
members", not "stream subscribers", which is really confusing given
that we have a "member" role which is also relevant in this text).
This commit is contained in:
Tim Abbott
2021-09-14 11:16:15 -07:00
parent 7c8e19758a
commit e7c62c4190
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/stream_data.js
View File

@@ -108,7 +108,7 @@ export const stream_privacy_policy_values = {
name: $t({defaultMessage: "Public"}),
description: $t({
defaultMessage:
"Anyone can join; anyone can view complete message history without joining",
"Organization members can join (guests must be invited by a subscriber); organization members can view complete message history without joining",
}),
},
private_with_public_history: {
@@ -116,7 +116,7 @@ export const stream_privacy_policy_values = {
name: $t({defaultMessage: "Private, shared history"}),
description: $t({
defaultMessage:
"Must be invited by a member; new members can view complete message history; hidden from non-administrator users",
"Must be invited by a subscriber; new subscribers can view complete message history; hidden from non-administrator users",
}),
},
private: {
@@ -124,7 +124,7 @@ export const stream_privacy_policy_values = {
name: $t({defaultMessage: "Private, protected history"}),
description: $t({
defaultMessage:
"Must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users",
"Must be invited by a subscriber; new subscribers can only see messages sent after they join; hidden from non-administrator users",
}),
},
};
@@ -135,7 +135,7 @@ if (page_params.development_environment) {
name: $t({defaultMessage: "Web public"}),
description: $t({
defaultMessage:
"Anyone can join; anyone on the Internet can view complete message history without creating an account",
"Organization members can join (guests must be invited by a subscriber); anyone on the Internet can view complete message history without creating an account",
}),
};
}

11
static/templates/stream_settings/stream_permission_description.hbs
View File

@@ -2,12 +2,12 @@
{{#if invite_only}}
<li>
{{#tr}}
This is a <b>private stream</b>. Only people who have been invited can access its content, but any member of the stream can invite others.
This is a <b>private stream</b>. Only people who have been invited can access its content, but any subscriber can invite others.
{{/tr}}
</li>
<li>
{{#if history_public_to_subscribers}}{{t 'New members can view complete message history.' }}
{{else}}{{t 'New members can only see messages sent after they join.' }}
{{#if history_public_to_subscribers}}{{t 'New subscribers can view complete message history.' }}
{{else}}{{t 'New subscribers can only see messages sent after they join.' }}
{{/if}}
</li>
{{else if is_web_public}}
@@ -19,7 +19,8 @@
{{else}}
<li>
{{#tr}}
This is a <b>public stream</b>. Any member of the organization can join without an invitation.
This is a <b>public stream</b>. Any member of the organization can join without an invitation
or view content sent to this stream.
{{/tr}}
</li>
{{/if}}
@@ -31,7 +32,7 @@
{{else if (eq stream_post_policy stream_post_policy_values.non_new_members.code)}}
{{t 'Only organization full members can post.'}}
{{else}}
{{t 'All stream members can post.'}}
{{t 'All stream subscribers can post.'}}
{{/if}}
</li>
{{#if message_retention_text}}