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

compose: Convert compose_error messages to FormatJS.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-04-12 16:44:36 -07:00
committed by Tim Abbott
parent 810ba7fce1
commit d761077dac
5 changed files with 107 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
frontend_tests/node_tests/compose.js
View File

@@ -6,7 +6,7 @@ const {JSDOM} = require("jsdom");
const MockDate = require("mockdate");
const {stub_templates} = require("../zjsunit/handlebars");
const {i18n} = require("../zjsunit/i18n");
const {$t_html, i18n} = require("../zjsunit/i18n");
const {mock_cjs, mock_esm, set_global, zrequire} = require("../zjsunit/namespace");
const {run_test} = require("../zjsunit/test");
const blueslip = require("../zjsunit/zblueslip");
@@ -183,7 +183,7 @@ test_ui("validate_stream_message_address_info", () => {
assert(!compose.validate_stream_message_address_info("Frontend"));
assert.equal(
$("#compose-error-msg").html(),
"translated: <p>The stream <b>Frontend</b> does not exist.</p><p>Manage your subscriptions <a href='#streams/all'>on your Streams page</a>.</p>",
"translated HTML: <p>The stream <b>Frontend</b> does not exist.</p><p>Manage your subscriptions <a href='#streams/all'>on your Streams page</a>.</p>",
);
channel.post = (payload) => {
@@ -191,7 +191,10 @@ test_ui("validate_stream_message_address_info", () => {
payload.error({status: 500});
};
assert(!compose.validate_stream_message_address_info("social"));
assert.equal($("#compose-error-msg").html(), i18n.t("Error checking subscription"));
assert.equal(
$("#compose-error-msg").html(),
$t_html({defaultMessage: "Error checking subscription"}),
);
});
test_ui("validate", () => {
@@ -229,7 +232,10 @@ test_ui("validate", () => {
assert(!$("#sending-indicator").visible());
assert(!$("#compose-send-button").is_focused());
assert.equal($("#compose-send-button").prop("disabled"), false);
assert.equal($("#compose-error-msg").html(), i18n.t("You have nothing to send!"));
assert.equal(
$("#compose-error-msg").html(),
$t_html({defaultMessage: "You have nothing to send!"}),
);
reminder.is_deferred_delivery = () => true;
compose.validate();
@@ -249,7 +255,9 @@ test_ui("validate", () => {
assert(zephyr_checked);
assert.equal(
$("#compose-error-msg").html(),
i18n.t("You need to be running Zephyr mirroring in order to send messages!"),
$t_html({
defaultMessage: "You need to be running Zephyr mirroring in order to send messages!",
}),
);
initialize_pm_pill();
@@ -262,7 +270,7 @@ test_ui("validate", () => {
assert(!compose.validate());
assert.equal(
$("#compose-error-msg").html(),
i18n.t("Please specify at least one valid recipient"),
$t_html({defaultMessage: "Please specify at least one valid recipient"}),
);
initialize_pm_pill();
@@ -273,7 +281,7 @@ test_ui("validate", () => {
assert.equal(
$("#compose-error-msg").html(),
i18n.t("Please specify at least one valid recipient", {}),
$t_html({defaultMessage: "Please specify at least one valid recipient"}),
);
compose_state.private_message_recipient("foo@zulip.com,alice@zulip.com");
@@ -281,7 +289,7 @@ test_ui("validate", () => {
assert.equal(
$("#compose-error-msg").html(),
i18n.t("Please specify at least one valid recipient", {}),
$t_html({defaultMessage: "Please specify at least one valid recipient"}),
);
people.add_active_user(bob);
@@ -295,13 +303,19 @@ test_ui("validate", () => {
compose_state.set_message_type("stream");
compose_state.stream_name("");
assert(!compose.validate());
assert.equal($("#compose-error-msg").html(), i18n.t("Please specify a stream"));
assert.equal(
$("#compose-error-msg").html(),
$t_html({defaultMessage: "Please specify a stream"}),
);
compose_state.stream_name("Denmark");
page_params.realm_mandatory_topics = true;
compose_state.topic("");
assert(!compose.validate());
assert.equal($("#compose-error-msg").html(), i18n.t("Please specify a topic"));
assert.equal(
$("#compose-error-msg").html(),
$t_html({defaultMessage: "Please specify a topic"}),
);
});
test_ui("get_invalid_recipient_emails", (override) => {
@@ -412,7 +426,9 @@ test_ui("validate_stream_message", (override) => {
assert(!compose.validate());
assert.equal(
$("#compose-error-msg").html(),
i18n.t("You do not have permission to use wildcard mentions in this stream."),
$t_html({
defaultMessage: "You do not have permission to use wildcard mentions in this stream.",
}),
);
});
@@ -435,7 +451,7 @@ test_ui("test_validate_stream_message_post_policy_admin_only", () => {
assert(!compose.validate());
assert.equal(
$("#compose-error-msg").html(),
i18n.t("Only organization admins are allowed to post to this stream."),
$t_html({defaultMessage: "Only organization admins are allowed to post to this stream."}),
);
// Reset error message.
@@ -449,7 +465,7 @@ test_ui("test_validate_stream_message_post_policy_admin_only", () => {
assert(!compose.validate());
assert.equal(
$("#compose-error-msg").html(),
i18n.t("Only organization admins are allowed to post to this stream."),
$t_html({defaultMessage: "Only organization admins are allowed to post to this stream."}),
);
});
@@ -469,7 +485,7 @@ test_ui("test_validate_stream_message_post_policy_full_members_only", () => {
assert(!compose.validate());
assert.equal(
$("#compose-error-msg").html(),
i18n.t("Guests are not allowed to post to this stream."),
$t_html({defaultMessage: "Guests are not allowed to post to this stream."}),
);
// reset compose_state.stream_name to 'social' again so that any tests occurring after this
@@ -885,7 +901,10 @@ test_ui("enter_with_preview_open", (override) => {
compose.enter_with_preview_open();
assert($("#enter_sends").prop("checked"));
assert.equal($("#compose-error-msg").html(), i18n.t("You have nothing to send!"));
assert.equal(
$("#compose-error-msg").html(),
$t_html({defaultMessage: "You have nothing to send!"}),
);
});
test_ui("finish", (override) => {
@@ -902,7 +921,10 @@ test_ui("finish", (override) => {
assert(!$("#sending-indicator").visible());
assert(!$("#compose-send-button").is_focused());
assert.equal($("#compose-send-button").prop("disabled"), false);
assert.equal($("#compose-error-msg").html(), i18n.t("You have nothing to send!"));
assert.equal(
$("#compose-error-msg").html(),
$t_html({defaultMessage: "You have nothing to send!"}),
);
})();
(function test_when_compose_validation_succeed() {