settings: Update wording in organization-permissions-admin.handlebars.

frontend_tests/casper_tests/10-admin.js

@@ -67,7 +67,7 @@ casper.then(function () {
                                           'Only administrators may now create new streams!');
         casper.test.assertEval(function () {
             return document.querySelector('input[type="checkbox"][id="id_realm_create_stream_by_admins_only"]').checked;
-        }, 'Only admins may create streams Setting activated');
+        }, 'Prevent users from creating streams Setting activated');
     });
 });
 
@@ -83,7 +83,7 @@ casper.waitUntilVisible('#id_realm_create_stream_by_admins_only + span', functio
     // Test Setting was saved
     casper.test.assertEval(function () {
         return document.querySelector('#id_realm_create_stream_by_admins_only').checked;
-    }, 'Only admins may create streams Setting saved');
+    }, 'Prevent users from creating streams Setting saved');
 
     // Deactivate setting
 
@@ -96,7 +96,7 @@ casper.then(function () {
         casper.test.assertSelectorHasText('#admin-realm-create-stream-by-admins-only-status', 'Any user may now create new streams!');
         casper.test.assertEval(function () {
             return !(document.querySelector('input[type="checkbox"][id="id_realm_create_stream_by_admins_only"]').checked);
-        }, 'Only admins may create streams Setting deactivated');
+        }, 'Prevent users from creating streams Setting deactivated');
     });
 });
 

static/js/settings_org.js

@@ -25,7 +25,7 @@ exports.populate_realm_domains = function (realm_domains) {
         domains = i18n.t("None");
         $("#id_realm_restricted_to_domain").prop("disabled", true);
     }
-    $("#realm_restricted_to_domains_label").text(i18n.t("New users restricted to the following domains: __domains__", {domains: domains}));
+    $("#realm_restricted_to_domains_label").text(i18n.t("Restrict new users to the following email domains: __domains__", {domains: domains}));
 
     var realm_domains_table_body = $("#realm_domains_table tbody").expectOne();
     realm_domains_table_body.find("tr").remove();

static/templates/settings/organization-permissions-admin.handlebars

@@ -1,6 +1,6 @@
 <div id="organization-permissions" data-name="organization-permissions" class="settings-section">
     <form class="form-horizontal admin-realm-form org-permissions-form">
-        <h3 class="light">{{t "Joining the Organization" }}</h3>
+        <h3 class="light">{{t "Joining the organization" }}</h3>
 
         <div class="alert" id="admin-realm-restricted-to-domain-status"></div>
         <div class="alert" id="admin-realm-invite-required-status"></div>
@@ -38,7 +38,7 @@
                 </label>
                 <label for="id_realm_invite_required" id="realm_invite_required_label" class="inline-block"
                     title="{{t 'If checked, users must be invited in order to join your organization.' }}">
-                    {{t "E-mail invitation required" }}
+                    {{t "Users cannot join without an invitation" }}
                 </label>
             </div>
 
@@ -51,12 +51,12 @@
                 </label>
                 <label for="id_realm_invite_by_admins_only" id="id_realm_invite_by_admins_only_label" class="inline-block"
                     title="{{t 'If checked, only administrators may invite new users.' }}">
-                    {{t "Only admins may invite" }}
+                    {{t "Only admins can invite new users" }}
                 </label>
             </div>
         </div>
 
-        <h3 class="light">{{t "User Identity" }}</h3>
+        <h3 class="light">{{t "User identity" }}</h3>
         <div class="side-padded-container m-10 inline-block organization-permissions-parent">
             <div class="input-group">
                 <label class="checkbox">
@@ -83,7 +83,7 @@
             </div>
         </div>
 
-        <h3 class="light">{{t "Streams & Custom Emoji" }}</h3>
+        <h3 class="light">{{t "Streams & custom emoji" }}</h3>
         <div class="side-padded-container m-10 inline-block organization-permissions-parent">
             <div class="input-group">
                 <label class="checkbox">
@@ -93,7 +93,7 @@
                 </label>
                 <label for="id_realm_create_stream_by_admins_only" id="id_realm_create_stream_by_admins_only_label" class="inline-block"
                     title="{{t 'If checked, only administrators may create new streams.' }}">
-                    {{t "Only admins may create streams" }}
+                    {{t "Prevent users from creating streams" }}
                 </label>
             </div>
 
@@ -105,12 +105,12 @@
                 </label>
                 <label for="id_realm_add_emoji_by_admins_only" id="id_realm_add_emoji_by_admins_only_label" class="inline-block"
                     title="{{t 'If checked, only administrators may add new emoji.'}}">
-                    {{t "Only admins may add emoji" }}
+                    {{t "Prevent users from adding custom emoji" }}
                 </label>
             </div>
         </div>
 
-        <h3 class="light">{{t "Message Editing" }}</h3>
+        <h3 class="light">{{t "Message editing" }}</h3>
         <div class="side-padded-container m-10 inline-block organization-permissions-parent">
             <div class="input-group">
                 <label class="checkbox">
@@ -120,7 +120,7 @@
                 </label>
                 <label for="id_realm_allow_message_editing" class="inline-block"
                     title="{{t 'If checked, users can edit the content and topics of their old messages.' }}">
-                    {{t "Allow users to edit old messages" }}
+                    {{t "Users can edit their messages" }}
                 </label>
             </div>
 
@@ -145,12 +145,12 @@
                 </label>
                 <label for="id_realm_allow_edit_history" id="id_realm_allow_edit_history_label" class="inline-block"
                     title="{{t 'If checked, users will be able view message edit history.'}}">
-                    {{t "Users can view message edit history" }}
+                    {{t "Enable message edit history" }}
                 </label>
             </div>
         </div>
 
-        <h3 class="light">{{t "Message Feed" }}</h3>
+        <h3 class="light">{{t "Message feed" }}</h3>
         <div class="side-padded-container m-10 inline-block organization-permissions-parent">
             {{#if false}}
             <div class="input-group">

templates/zerver/help/allow-anyone-to-join-without-an-invitation.md

@@ -14,10 +14,10 @@ members to those with email invitations.
 {!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
 {!admin.md!}
 
-4. Locate the **E-mail invitation required** checkbox.
+4. Locate the **Users cannot join without an invitation** checkbox.
 
     To limit new members of your organization to those who have been
-    invited to do so, click the **E-mail invitation required** checkbox.
+    invited to do so, click the **Users cannot join without an invitation** checkbox.
 
     New users will now require an email invitation sent by a user in your Zulip
 organization to join your organization.

templates/zerver/help/disable-message-edit-history.md

@@ -17,6 +17,6 @@ organization using the following steps:
 {!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
 {!admin.md!}
 
-2. Disable the the **Users can view edit message history** checkbox.
+2. Disable the the **Enable message edit history** checkbox.
 
 {!save-changes.md!} organization settings.

templates/zerver/help/import-users-and-channels-from-slack.md

@@ -41,4 +41,4 @@ If the users are not from the same organization, you should change your organiza
 {!go-to-the.md!} [Organization settings](/#administration/organization-settings)
 {!admin.md!}
 
-2. Disable the **New users restricted to the following domains** option.
+2. Disable the **Restrict new users to the following email domains** option.

templates/zerver/help/only-allow-admins-to-add-emoji.md

@@ -9,6 +9,6 @@ administrators to add new emoji.
 {!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
 {!admin.md!}
 
-2. Select the **Only admins may add emoji** checkbox.
+2. Select the **Prevent users from adding custom emoji** checkbox.
 
 {!save-changes.md!} organization settings.

templates/zerver/help/only-allow-admins-to-create-new-streams-feature.md

@@ -8,6 +8,6 @@ only allows administrators to create new streams in the organization.
 {!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
 {!admin.md!}
 
-2. Select the **Only admins may create streams** checkbox.
+2. Select the **Prevent users from creating streams** checkbox.
 
 {!save-changes.md!} organization settings.

templates/zerver/help/only-allow-admins-to-invite-new-users.md

@@ -9,7 +9,7 @@ invite new users.
 {!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
 {!admin.md!}
 
-2. Select the **E-mail invitation required** and **Only admins may invite**
+2. Select the **Users cannot join without an invitation** and **Only admins can invite new users**
 checkboxes.
 
     If this option is enabled, only administrators in your organization can send

templates/zerver/help/restrict-editing-of-old-messages-and-topics.md

@@ -9,13 +9,13 @@ disable message editing for your organization users.
 {!go-to-the.md!} [Organization permissions](/#organization/organization-permissions)
 {!admin.md!}
 
-4. Locate the **Users can edit old messages**
+4. Locate the **Users can edit their messages**
 checkbox and **Message edit limit in minutes (0 for no limit)** input field
 underneath it.
 
     By default, user message editing is enabled for 10 minutes after sending.
 
-    * **Users can edit old messages** - Uncheck this option if you wish to
+    * **Users can edit their messages** - Uncheck this option if you wish to
     disable message editing. Upon doing so, the **Message edit limit in minutes (0 for no limit)**
     input field will be grayed out.