paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

org_settings: Change new user 24-hour setting to dropdown.

Browse Source 
These should work consistently with how the individual user setting
works; see the last commit.

With changes from tabbott to fix real-time sync.

Fixes #12553.
This commit is contained in:
Sophie
2019-07-30 10:52:06 +03:00
committed by Tim Abbott
parent 9d3ebf22ef
commit 2eba3e7827
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/admin.js
View File

@@ -7,7 +7,7 @@ const admin_settings_label = {
realm_mandatory_topics: i18n.t("Require topics in stream messages"),
realm_inline_image_preview: i18n.t("Show previews of uploaded and linked images"),
realm_inline_url_embed_preview: i18n.t("Show previews of linked websites"),
realm_default_twenty_four_hour_time: i18n.t("24-hour time (17:00 instead of 5:00 PM)"),
realm_default_twenty_four_hour_time: i18n.t("Time format"),
realm_send_welcome_emails: i18n.t("Send emails introducing Zulip to new users"),
realm_message_content_allowed_in_email_notifications:
i18n.t("Allow message content in missed message emails"),
@@ -29,6 +29,7 @@ exports.build_page = function () {
server_inline_image_preview: page_params.server_inline_image_preview,
realm_inline_url_embed_preview: page_params.realm_inline_url_embed_preview,
server_inline_url_embed_preview: page_params.server_inline_url_embed_preview,
realm_default_twenty_four_hour_time_values: settings_display.twenty_four_hour_time_values,
realm_authentication_methods: page_params.realm_authentication_methods,
realm_create_stream_policy: page_params.realm_create_stream_policy,
realm_invite_to_stream_policy: page_params.realm_invite_to_stream_policy,
@@ -63,7 +64,6 @@ exports.build_page = function () {
realm_send_welcome_emails: page_params.realm_send_welcome_emails,
realm_message_content_allowed_in_email_notifications:
page_params.realm_message_content_allowed_in_email_notifications,
realm_default_twenty_four_hour_time: page_params.realm_default_twenty_four_hour_time,
settings_send_digest_emails: page_params.settings_send_digest_emails,
realm_digest_emails_enabled: page_params.realm_digest_emails_enabled,
realm_digest_weekday: page_params.realm_digest_weekday,
@@ -97,6 +97,12 @@ exports.build_page = function () {
$("#id_realm_default_language").val(page_params.realm_default_language);
$("#id_realm_digest_weekday").val(options.realm_digest_weekday);
// default_twenty_four_hour time is a boolean in the API but a
// dropdown, so we need to convert the value to a string for
// storage in the browser's DOM.
$("#id_realm_default_twenty_four_hour_time").val(JSON.stringify(
page_params.realm_default_twenty_four_hour_time));
};