From 37e00dce78519e3a6b6fb09d922cee629f03378a Mon Sep 17 00:00:00 2001
From: Rishi Gupta <rishig@zulipchat.com>
Date: Mon, 29 Oct 2018 22:53:05 -0700
Subject: [PATCH] settings: Update organization permission strings to reflect
 guests.

---
 static/js/settings_bots.js                           |  4 ++--
 .../organization-permissions-admin.handlebars        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/static/js/settings_bots.js b/static/js/settings_bots.js
index 1c1d33f2a1..0dc2ad9779 100644
--- a/static/js/settings_bots.js
+++ b/static/js/settings_bots.js
@@ -151,7 +151,7 @@ exports.generate_botserverrc_content = function (email, api_key, token) {
 exports.bot_creation_policy_values = {
     everyone: {
         code: 1,
-        description: i18n.t("Everyone"),
+        description: i18n.t("Members and admins"),
     },
     admins_only: {
         code: 3,
@@ -159,7 +159,7 @@ exports.bot_creation_policy_values = {
     },
     restricted: {
         code: 2,
-        description: i18n.t("Everyone, but only admins can add generic bots"),
+        description: i18n.t("Members and admins, but only admins can add generic bots"),
     },
 };
 
diff --git a/static/templates/settings/organization-permissions-admin.handlebars b/static/templates/settings/organization-permissions-admin.handlebars
index 82f4432146..72432cc895 100644
--- a/static/templates/settings/organization-permissions-admin.handlebars
+++ b/static/templates/settings/organization-permissions-admin.handlebars
@@ -11,8 +11,8 @@
                     <label for="realm_user_invite_restriction" class="dropdown-title">{{t "Are invitations required for joining the organization?" }}</label>
                     <select name="realm_user_invite_restriction" id="id_realm_user_invite_restriction">
                         <option value="no_invite_required">{{t "No" }}</option>
-                        <option value="by_anyone">{{t "Yes, and normal users can send invitations" }}</option>
-                        <option value="by_admins_only">{{t "Yes, and only admins can send invitations" }}</option>
+                        <option value="by_anyone">{{t "Yes. Members and admins can send invitations." }}</option>
+                        <option value="by_admins_only">{{t "Yes. Only admins can send invitations." }}</option>
                     </select>
                 </div>
 
@@ -62,10 +62,10 @@
                 <div class="input-group">
                     <label for="realm_create_stream_permission" class="dropdown-title">{{t "Who can create streams" }}</label>
                     <select name="realm_create_stream_permission" id="id_realm_create_stream_permission">
-                        <option value="by_anyone">{{t "Everyone" }}</option>
+                        <option value="by_anyone">{{t "Members and admins" }}</option>
                         <option value="by_admins_only">{{t "Admins only" }}</option>
-                        <option value="by_admin_user_with_three_days_old">{{t "All admins, and users with accounts at least 3 days old." }}</option>
-                        <option value="by_admin_user_with_custom_time">{{t "All admins, and users with accounts at least N days old." }}</option>
+                        <option value="by_admin_user_with_three_days_old">{{t "All admins, and members with accounts at least 3 days old." }}</option>
+                        <option value="by_admin_user_with_custom_time">{{t "All admins, and members with accounts at least N days old." }}</option>
                     </select>
                 </div>
                 <div class="dependent-block">
@@ -88,7 +88,7 @@
                 <div class="inline-block">
                     <label for="realm_add_emoji_by_admins_only" class="dropdown-title">{{t "Who can add custom emoji" }}</label>
                     <select name="realm_add_emoji_by_admins_only" id="id_realm_add_emoji_by_admins_only">
-                        <option value="by_anyone">{{t "Everyone" }}</option>
+                        <option value="by_anyone">{{t "Members and admins" }}</option>
                         <option value="by_admins_only">{{t "Admins only" }}</option>
                     </select>
                 </div>