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

ui_report: Convert messages to FormatJS.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-04-12 20:18:25 -07:00
committed by Tim Abbott
parent 073ec04335
commit a397d51670
24 changed files with 209 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
static/js/settings_ui.js
View File

@@ -1,6 +1,6 @@
import $ from "jquery";
import {i18n} from "./i18n";
import {$t_html, i18n} from "./i18n";
import * as loading from "./loading";
import * as ui_report from "./ui_report";
@@ -12,8 +12,8 @@ export function display_checkmark($elem) {
}
export const strings = {
success: i18n.t("Saved"),
failure: i18n.t("Save failed"),
success_html: $t_html({defaultMessage: "Saved"}),
failure_html: $t_html({defaultMessage: "Save failed"}),
saving: i18n.t("Saving"),
};
@@ -26,7 +26,7 @@ export function do_settings_change(
data,
status_element,
{
success_msg = strings.success,
success_msg_html = strings.success_html,
success_continuation,
error_continuation,
sticky = false,
@@ -44,7 +44,7 @@ export function do_settings_change(
data,
success(reponse_data) {
setTimeout(() => {
ui_report.success(success_msg, spinner, remove_after);
ui_report.success(success_msg_html, spinner, remove_after);
display_checkmark(spinner);
}, appear_after);
if (success_continuation !== undefined) {
@@ -54,9 +54,9 @@ export function do_settings_change(
error(xhr) {
if (error_msg_element) {
loading.destroy_indicator(spinner);
ui_report.error(strings.failure, xhr, error_msg_element);
ui_report.error(strings.failure_html, xhr, error_msg_element);
} else {
ui_report.error(strings.failure, xhr, spinner);
ui_report.error(strings.failure_html, xhr, spinner);
}
if (error_continuation !== undefined) {
error_continuation(xhr);