diff --git a/frontend_tests/node_tests/i18n.js b/frontend_tests/node_tests/i18n.js index 6c4fc3c108..f29487f584 100644 --- a/frontend_tests/node_tests/i18n.js +++ b/frontend_tests/node_tests/i18n.js @@ -50,7 +50,7 @@ i18n.init({ left_side_userlist: false, twenty_four_hour_time: false, stream_desktop_notifications_enabled: false, - stream_sounds_enabled: false, + enable_stream_sounds: false, desktop_notifications_enabled: false, enable_sounds: false, enable_offline_email_notifications: false, diff --git a/frontend_tests/node_tests/templates.js b/frontend_tests/node_tests/templates.js index ded906ed5f..47d08296a1 100644 --- a/frontend_tests/node_tests/templates.js +++ b/frontend_tests/node_tests/templates.js @@ -780,7 +780,7 @@ function render(template_name, args) { (function settings_tab() { var page_param_checkbox_options = { stream_desktop_notifications_enabled: true, - stream_sounds_enabled: true, desktop_notifications_enabled: true, + enable_stream_sounds: true, desktop_notifications_enabled: true, enable_sounds: true, enable_offline_email_notifications: true, enable_offline_push_notifications: true, enable_online_push_notifications: true, enable_digest_emails: true, diff --git a/static/js/notifications.js b/static/js/notifications.js index e311a53326..fe0fa37ebf 100644 --- a/static/js/notifications.js +++ b/static/js/notifications.js @@ -638,7 +638,7 @@ exports.handle_global_notification_updates = function (notification_name, settin if (notification_name === "enable_stream_desktop_notifications") { page_params.stream_desktop_notifications_enabled = setting; } else if (notification_name === "enable_stream_sounds") { - page_params.stream_sounds_enabled = setting; + page_params.enable_stream_sounds = setting; } else if (notification_name === "enable_desktop_notifications") { page_params.desktop_notifications_enabled = setting; } else if (notification_name === "enable_sounds") { diff --git a/static/js/settings_notifications.js b/static/js/settings_notifications.js index 969918ff00..53729fb73a 100644 --- a/static/js/settings_notifications.js +++ b/static/js/settings_notifications.js @@ -20,7 +20,7 @@ exports.set_up = function () { result.enable_stream_desktop_notifications; } if (result.enable_stream_sounds !== undefined) { - page_params.stream_sounds_enabled = result.enable_stream_sounds; + page_params.enable_stream_sounds = result.enable_stream_sounds; } // PM and @-mention notification settings. @@ -143,7 +143,7 @@ exports.set_up = function () { function _update_page() { $("#enable_stream_desktop_notifications").prop('checked', page_params.stream_desktop_notifications_enabled); - $("#enable_stream_sounds").prop('checked', page_params.stream_sounds_enabled); + $("#enable_stream_sounds").prop('checked', page_params.enable_stream_sounds); $("#enable_desktop_notifications").prop('checked', page_params.desktop_notifications_enabled); $("#enable_sounds").prop('checked', page_params.enable_sounds); $("#enable_offline_email_notifications").prop('checked', page_params.enable_offline_email_notifications); diff --git a/static/js/stream_data.js b/static/js/stream_data.js index 76e3b86195..f87e67cffb 100644 --- a/static/js/stream_data.js +++ b/static/js/stream_data.js @@ -279,7 +279,7 @@ exports.create_sub_from_server_data = function (stream_name, attrs) { in_home_view: true, invite_only: false, desktop_notifications: page_params.stream_desktop_notifications_enabled, - audible_notifications: page_params.stream_sounds_enabled, + audible_notifications: page_params.enable_stream_sounds, description: '', }); diff --git a/static/templates/settings/notification-settings.handlebars b/static/templates/settings/notification-settings.handlebars index 212216b83f..1dce19bdff 100644 --- a/static/templates/settings/notification-settings.handlebars +++ b/static/templates/settings/notification-settings.handlebars @@ -31,7 +31,7 @@