paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 19:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin.js: Simplify wording around the restricted to domain setting.

Browse Source 
Remove stringify_list_with_conjunction, which would have been tough for
i18n, and make it clear that the setting only affects new users.
This commit is contained in:
Harshit Bansal
2017-01-16 16:19:05 -08:00
committed by Tim Abbott
parent 1a63f15382
commit ec02599336
1 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
static/js/admin.js
View File

@@ -155,17 +155,6 @@ function make_stream_default(stream_name) {
}); });
} }
function stringify_list_with_conjunction(lst, conjunction) {
if (lst.length === 0) {
return '';
} else if (lst.length === 1) {
return lst.toString();
} else if (lst.length === 2) {
return lst.join(" " + conjunction + " ");
}
return lst.slice(0, lst.length-1).join(", ") + ", " + conjunction + " " + lst[lst.length-1].toString();
}
exports.populate_emoji = function (emoji_data) { exports.populate_emoji = function (emoji_data) {
var emoji_table = $('#admin_emoji_table').expectOne(); var emoji_table = $('#admin_emoji_table').expectOne();
emoji_table.find('tr.emoji_row').remove(); emoji_table.find('tr.emoji_row').remove();
@@ -205,9 +194,11 @@ exports.populate_realm_aliases = function (aliases) {
var domains_list = _.map(page_params.domains, function (ADomain) { var domains_list = _.map(page_params.domains, function (ADomain) {
return ADomain.domain; return ADomain.domain;
}); });
var domains = stringify_list_with_conjunction(domains_list, "or"); var domains = domains_list.join(', ');
if (domains.length === 0) {
$("#realm_restricted_to_domains_label").text(i18n.t("Users restricted to __domains__", {domains: domains})); domains = i18n.t("None");
}
$("#realm_restricted_to_domains_label").text(i18n.t("New users restricted to the following domains: __domains__", {domains: domains}));
alias_table.find("tr").remove(); alias_table.find("tr").remove();
_.each(aliases, function (alias) { _.each(aliases, function (alias) {
@@ -578,16 +569,7 @@ function _setup_page() {
} }
if (response_data.restricted_to_domain !== undefined) { if (response_data.restricted_to_domain !== undefined) {
if (response_data.restricted_to_domain) { if (response_data.restricted_to_domain) {
var atdomains = _.map(page_params.domains, function (ADomain) { ui.report_success(i18n.t("New user e-mails now restricted to certain domains!"), restricted_to_domain_status);
return ADomain.domain;
});
var i;
for (i = 0; i < atdomains.length; i += 1) {
atdomains[i] = '@' + atdomains[i];
}
var atdomains_string = stringify_list_with_conjunction(atdomains, "or");
ui.report_success(i18n.t("New users must have e-mails ending in __atdomains_string__!", {atdomains_string: atdomains_string}), restricted_to_domain_status);
} else { } else {
ui.report_success(i18n.t("New users may have arbitrary e-mails!"), restricted_to_domain_status); ui.report_success(i18n.t("New users may have arbitrary e-mails!"), restricted_to_domain_status);
} }