paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 18:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Update organization permission strings to reflect guests.

Browse Source
This commit is contained in:
Rishi Gupta
2018-10-29 22:53:05 -07:00
parent 3ea34b3b7c
commit 37e00dce78
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/settings_bots.js
View File

@@ -151,7 +151,7 @@ exports.generate_botserverrc_content = function (email, api_key, token) {
exports.bot_creation_policy_values = { exports.bot_creation_policy_values = {
everyone: { everyone: {
code: 1, code: 1,
description: i18n.t("Everyone"), description: i18n.t("Members and admins"),
}, },
admins_only: { admins_only: {
code: 3, code: 3,
@@ -159,7 +159,7 @@ exports.bot_creation_policy_values = {
}, },
restricted: { restricted: {
code: 2, 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"),
}, },
}; };

12
static/templates/settings/organization-permissions-admin.handlebars
View File

@@ -11,8 +11,8 @@
<label for="realm_user_invite_restriction" class="dropdown-title">{{t "Are invitations required for joining the organization?" }}</label> <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"> <select name="realm_user_invite_restriction" id="id_realm_user_invite_restriction">
<option value="no_invite_required">{{t "No" }}</option> <option value="no_invite_required">{{t "No" }}</option>
<option value="by_anyone">{{t "Yes, and normal users can send invitations" }}</option> <option value="by_anyone">{{t "Yes. Members and admins can send invitations." }}</option>
<option value="by_admins_only">{{t "Yes, and only admins can send invitations" }}</option> <option value="by_admins_only">{{t "Yes. Only admins can send invitations." }}</option>
</select> </select>
</div> </div>
@@ -62,10 +62,10 @@
<div class="input-group"> <div class="input-group">
<label for="realm_create_stream_permission" class="dropdown-title">{{t "Who can create streams" }}</label> <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"> <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_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_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 users with accounts at least N 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> </select>
</div> </div>
<div class="dependent-block"> <div class="dependent-block">
@@ -88,7 +88,7 @@
<div class="inline-block"> <div class="inline-block">
<label for="realm_add_emoji_by_admins_only" class="dropdown-title">{{t "Who can add custom emoji" }}</label> <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"> <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> <option value="by_admins_only">{{t "Admins only" }}</option>
</select> </select>
</div> </div>