Replace all user-facing references to "invite-only" with "private".

Fixes #9611.
This commit is contained in:
Eeshan Garg
2018-06-08 17:35:07 -02:30
committed by showell
parent d060101cfa
commit 0a43e5e257
13 changed files with 18 additions and 20 deletions

View File

@@ -40,5 +40,5 @@ class Command(BaseCommand):
active=True)),), end=' ')
num_messages = len(Message.objects.filter(recipient=recipient))
print("%12d" % (num_messages,))
print("%d invite-only streams" % (invite_only_count,))
print("%d private streams" % (invite_only_count,))
print("")

View File

@@ -40,7 +40,7 @@ Usage assumptions and concepts
Zulip is a real-time web-based chat application meant for companies and
similar groups ranging in size from a small team to more than a thousand
users. It features real-time notifications, message persistence and
search, public group conversations (*streams*), invite-only streams,
search, public group conversations (*streams*), private streams,
private one-on-one and group conversations, inline image previews, team
presence/buddy lists, a rich API, Markdown message support, and numerous
integrations with other services. The maintainer team aims to support

View File

@@ -95,13 +95,11 @@ strength allowed is controlled by two settings in
parser which escapes content to protect against cross-site scripting
attacks.
* Zulip supports both public streams and private ("invite-only")
streams. Any Zulip user can join any public stream in the realm,
and can view the complete message history of any public stream
without joining the stream.
* Zulip supports both public streams and private streams. Any Zulip
user can join any public stream in the realm, and can view the complete
message history of any public stream without joining the stream.
* A private ("invite-only") stream is hidden from users who are not
subscribed to the stream.
* A private stream is hidden from users who are not subscribed to the stream.
* Users who are not members of a private stream cannot read messages
on the stream, send messages to the stream, or join the stream,
even if they are a Zulip organization administrator.

View File

@@ -287,7 +287,7 @@ First, we start off with "positive" tests.
- Have Cordelia subscribe to the stream.
- Verify Cordelia can see the previous message.
- Have Cordelia post a message to the stream.
- Have Hamlet create an invite-only stream with Cordelia
- Have Hamlet create a private stream with Cordelia
invited and test a two-way conversation between the two
users.

View File

@@ -1240,7 +1240,7 @@ run_test('subscription_settings', () => {
html += render('subscription_settings', sub);
var div = $(html).find(".subscription-type");
assert(div.text().indexOf('invite-only stream') > 0);
assert(div.text().indexOf('private stream') > 0);
var anchor = $(html).find(".change-stream-privacy:first");
assert.equal(anchor.text(), "[translated: Change]");

View File

@@ -9,7 +9,7 @@
title="{{#tr this}}Narrow to stream "__display_recipient__"{{/tr}}">
{{! invite only lock }}
{{#if invite_only}}
<i class="icon-vector-lock invite-stream-icon" title="{{t 'This is an invite-only stream' }}"></i>
<i class="icon-vector-lock invite-stream-icon" title="{{t 'This is a private stream' }}"></i>
{{/if}}
{{display_recipient}}
</a>

View File

@@ -1,5 +1,5 @@
{{#if invite_only}}
{{t 'This is an <span class="icon-vector-lock"></span> <b>invite-only stream</b>. Only people who have been invited can access its content, but&nbsp;any&nbsp;member&nbsp;of&nbsp;the&nbsp;stream can&nbsp;invite&nbsp;others.' }}
{{t 'This is a <span class="icon-vector-lock"></span> <b>private stream</b>. Only people who have been invited can access its content, but&nbsp;any&nbsp;member&nbsp;of&nbsp;the&nbsp;stream can&nbsp;invite&nbsp;others.' }}
{{#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}}

View File

@@ -216,7 +216,7 @@
},
{
"argument": "invite_only",
"description": "A boolean specifying whether the streams specified in `subscriptions` are invite-only or not. Default is `False`.",
"description": "A boolean specifying whether the streams specified in `subscriptions` are private or not. Default is `False`.",
"required": false,
"example": "`True` or `False`"
},

View File

@@ -70,8 +70,8 @@ zulip(config).then((client) => {
* `stream_id`: The unique ID of a stream.
* `name`: The name of a stream.
* `description`: A short description of a stream.
* `invite-only`: Specifies whether a stream is invite-only or not.
Only people who have been invited can access an invite-only stream.
* `invite-only`: Specifies whether a stream is private or not.
Only people who have been invited can access a private stream.
#### Example response

View File

@@ -64,8 +64,8 @@ This request takes no arguments.
* `stream_id`: The unique ID of a stream.
* `name`: The name of a stream.
* `description`: A short description of a stream.
* `invite-only`: Specifies whether a stream is invite-only or not.
Only people who have been invited can access an invite-only stream.
* `invite-only`: Specifies whether a stream is private or not.
Only people who have been invited can access a private stream.
* `subscribers`: A list of email addresses of users who are also subscribed
to a given stream.
* `desktop_notifications`: A boolean specifiying whether desktop notifications

View File

@@ -61,7 +61,7 @@
<div class="message_header_colorblock message_header_stream left_part"></div>
<div class="right_part">
<span id="compose-lock-icon">
<i class="icon-vector-lock" title="{{ _('This is an invite-only stream') }}"></i>
<i class="icon-vector-lock" title="{{ _('This is a private stream') }}"></i>
</span>
<input type="text" class="recipient_box" name="stream" id="stream" maxlength="30" value="" placeholder="{{ _('Stream') }}" autocomplete="off" tabindex="0" aria-label="{{ _('Stream') }}" />
<i class="icon-vector-narrow icon-vector-small"></i>

View File

@@ -2,7 +2,7 @@
Streams can either be public to anyone in the organization, or require an
invitation to join. Organization admins can always see the names and
membership of invite-only streams, but cannot read any of the messages.
membership of private streams, but cannot read any of the messages.
If you are an administrator setting up streams for the first time, we highly
recommend reading our

View File

@@ -28,7 +28,7 @@ The `--name` parameter must match the name you gave the bot on
the settings page.
Hubot will automatically listen for commands on all public streams.
You can also invite Hubot to invite-only streams.
You can also invite Hubot to private streams.
To test your Hubot installation, send it an @-notification with a
basic command, for example `@Hubot pug me`, which should produce a