From def1e0151285bc358d8a6b48df61d452db22d4df Mon Sep 17 00:00:00 2001 From: Vishnu KS Date: Fri, 5 Mar 2021 01:13:27 +0530 Subject: [PATCH] i18n: Translate quote and reply mention text. Fixes #17479 --- frontend_tests/node_tests/compose_actions.js | 7 ++++--- static/js/compose_actions.js | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend_tests/node_tests/compose_actions.js b/frontend_tests/node_tests/compose_actions.js index aa8603ad62..5d22cffaf1 100644 --- a/frontend_tests/node_tests/compose_actions.js +++ b/frontend_tests/node_tests/compose_actions.js @@ -333,7 +333,8 @@ test("quote_and_reply", (override) => { sender_full_name: "Steve Stephenson", sender_id: 90, }; - hash_util.by_conversation_and_time_uri = () => "link_to_message"; + hash_util.by_conversation_and_time_uri = () => + "https://chat.zulip.org/#narrow/stream/92-learning/topic/Tornado"; let success_function; override(channel, "get", (opts) => { @@ -356,7 +357,7 @@ test("quote_and_reply", (override) => { replaced = false; expected_replacement = - "@_**Steve Stephenson|90** [said](link_to_message):\n```quote\nTesting.\n```"; + "translated: @_**Steve Stephenson|90** [said](https://chat.zulip.org/#narrow/stream/92-learning/topic/Tornado):\n```quote\nTesting.\n```"; quote_and_reply(opts); @@ -395,7 +396,7 @@ test("quote_and_reply", (override) => { replaced = false; expected_replacement = - "@_**Steve Stephenson|90** [said](link_to_message):\n````quote\n```\nmultiline code block\nshoudln't mess with quotes\n```\n````"; + "translated: @_**Steve Stephenson|90** [said](https://chat.zulip.org/#narrow/stream/92-learning/topic/Tornado):\n````quote\n```\nmultiline code block\nshoudln't mess with quotes\n```\n````"; quote_and_reply(opts); assert(replaced); }); diff --git a/static/js/compose_actions.js b/static/js/compose_actions.js index be337d0224..6d474fa751 100644 --- a/static/js/compose_actions.js +++ b/static/js/compose_actions.js @@ -456,8 +456,11 @@ export function quote_and_reply(opts) { // ```quote // message content // ``` - let content = `@_**${message.sender_full_name}|${message.sender_id}** `; - content += `[said](${hash_util.by_conversation_and_time_uri(message)}):\n`; + let content = i18n.t("__username__ [said](__- link_to_message__):", { + username: `@_**${message.sender_full_name}|${message.sender_id}**`, + link_to_message: `${hash_util.by_conversation_and_time_uri(message)}`, + }); + content += "\n"; const fence = fenced_code.get_unused_fence(message.raw_content); content += `${fence}quote\n${message.raw_content}\n${fence}`; compose_ui.replace_syntax("[Quoting…]", content, textarea);