From 0a43e5e257c0e2779e807200f320dc2c595a9238 Mon Sep 17 00:00:00 2001 From: Eeshan Garg Date: Fri, 8 Jun 2018 17:35:07 -0230 Subject: [PATCH] Replace all user-facing references to "invite-only" with "private". Fixes #9611. --- analytics/management/commands/stream_stats.py | 2 +- docs/overview/architecture-overview.md | 2 +- docs/production/security-model.md | 10 ++++------ docs/testing/manual-testing.md | 2 +- frontend_tests/node_tests/templates.js | 2 +- static/templates/recipient_row.handlebars | 2 +- static/templates/subscription_type.handlebars | 2 +- templates/zerver/api/arguments.json | 2 +- templates/zerver/api/get-all-streams.md | 4 ++-- templates/zerver/api/get-subscribed-streams.md | 4 ++-- templates/zerver/app/compose.html | 2 +- templates/zerver/help/create-a-stream.md | 2 +- templates/zerver/integrations/hubot.md | 2 +- 13 files changed, 18 insertions(+), 20 deletions(-) diff --git a/analytics/management/commands/stream_stats.py b/analytics/management/commands/stream_stats.py index 50ee143ba6..e260bbaff3 100644 --- a/analytics/management/commands/stream_stats.py +++ b/analytics/management/commands/stream_stats.py @@ -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("") diff --git a/docs/overview/architecture-overview.md b/docs/overview/architecture-overview.md index b5cdd670ad..a00d36fa87 100644 --- a/docs/overview/architecture-overview.md +++ b/docs/overview/architecture-overview.md @@ -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 diff --git a/docs/production/security-model.md b/docs/production/security-model.md index e691471f59..589ce6437b 100644 --- a/docs/production/security-model.md +++ b/docs/production/security-model.md @@ -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. diff --git a/docs/testing/manual-testing.md b/docs/testing/manual-testing.md index 1fea2fd316..20c9a82cdf 100644 --- a/docs/testing/manual-testing.md +++ b/docs/testing/manual-testing.md @@ -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. diff --git a/frontend_tests/node_tests/templates.js b/frontend_tests/node_tests/templates.js index c88572c376..4389322c15 100644 --- a/frontend_tests/node_tests/templates.js +++ b/frontend_tests/node_tests/templates.js @@ -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]"); diff --git a/static/templates/recipient_row.handlebars b/static/templates/recipient_row.handlebars index 866c37a385..f5d6443197 100644 --- a/static/templates/recipient_row.handlebars +++ b/static/templates/recipient_row.handlebars @@ -9,7 +9,7 @@ title="{{#tr this}}Narrow to stream "__display_recipient__"{{/tr}}"> {{! invite only lock }} {{#if invite_only}} - + {{/if}} {{display_recipient}} diff --git a/static/templates/subscription_type.handlebars b/static/templates/subscription_type.handlebars index e37ab99b39..347ec6c724 100644 --- a/static/templates/subscription_type.handlebars +++ b/static/templates/subscription_type.handlebars @@ -1,5 +1,5 @@ {{#if invite_only}} - {{t 'This is an invite-only stream. Only people who have been invited can access its content, but any member of the stream can invite others.' }} + {{t 'This is a private stream. Only people who have been invited can access its content, but any member of the stream can invite 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}} diff --git a/templates/zerver/api/arguments.json b/templates/zerver/api/arguments.json index 8a70b0d2e7..2e808b3922 100644 --- a/templates/zerver/api/arguments.json +++ b/templates/zerver/api/arguments.json @@ -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`" }, diff --git a/templates/zerver/api/get-all-streams.md b/templates/zerver/api/get-all-streams.md index 2b7d105925..854e4ffc8d 100644 --- a/templates/zerver/api/get-all-streams.md +++ b/templates/zerver/api/get-all-streams.md @@ -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 diff --git a/templates/zerver/api/get-subscribed-streams.md b/templates/zerver/api/get-subscribed-streams.md index ff98866c61..e0c76c047f 100644 --- a/templates/zerver/api/get-subscribed-streams.md +++ b/templates/zerver/api/get-subscribed-streams.md @@ -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 diff --git a/templates/zerver/app/compose.html b/templates/zerver/app/compose.html index 787b71c143..9ed23d06bd 100644 --- a/templates/zerver/app/compose.html +++ b/templates/zerver/app/compose.html @@ -61,7 +61,7 @@
- + diff --git a/templates/zerver/help/create-a-stream.md b/templates/zerver/help/create-a-stream.md index ff6c306d5f..14da11fa01 100644 --- a/templates/zerver/help/create-a-stream.md +++ b/templates/zerver/help/create-a-stream.md @@ -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 diff --git a/templates/zerver/integrations/hubot.md b/templates/zerver/integrations/hubot.md index 8df51aa654..8f02d935f5 100644 --- a/templates/zerver/integrations/hubot.md +++ b/templates/zerver/integrations/hubot.md @@ -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