Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
popover_menus_data: Pass Quote and Forward menu labels via context.
Aman Agrawal9fb91a85e26f
diff --git a/web/src/popover_menus_data.ts b/web/src/popover_menus_data.tsindex ac47e3f2062..e507b41a54d 100644--- a/web/src/popover_menus_data.ts+++ b/web/src/popover_menus_data.ts@@ -42,6 +42,8 @@ type ActionPopoverContext = {should_display_collapse: boolean;should_display_uncollapse: boolean;should_display_quote_message: boolean;+ quote_message_menu_item: string;+ forward_message_menu_item: string;conversation_time_url: string;should_display_delete_option: boolean;should_display_read_receipts_option: boolean;@@ -212,6 +214,8 @@ export function get_actions_popover_content_context(message_id: number): ActionP}const should_display_quote_message = not_spectator;+ const quote_message_menu_item = $t({defaultMessage: "Quote message"});+ const forward_message_menu_item = $t({defaultMessage: "Forward message"});const conversation_time_url = hash_util.by_conversation_and_time_url(message);@@ -260,6 +264,8 @@ export function get_actions_popover_content_context(message_id: number): ActionPshould_display_delete_option,should_display_read_receipts_option,should_display_quote_message,+ quote_message_menu_item,+ forward_message_menu_item,should_display_message_report_option: should_display_message_report_option(),};}diff --git a/web/templates/popovers/message_actions_popover.hbs b/web/templates/popovers/message_actions_popover.hbsindex 63715a7c3cb..128cabe3a92 100644--- a/web/templates/popovers/message_actions_popover.hbs+++ b/web/templates/popovers/message_actions_popover.hbs@@ -5,14 +5,14 @@<li role="none" class="link-item popover-menu-list-item"><a role="menuitem" data-message-id="{{message_id}}" class="respond_button popover-menu-link" tabindex="0"><i class="popover-menu-icon zulip-icon zulip-icon-quote-message" aria-hidden="true"></i>- <span class="popover-menu-label">{{t "Quote message" }}</span>+ <span class="popover-menu-label">{{quote_message_menu_item}}</span>{{popover_hotkey_hints ">"}}</a></li><li role="none" class="link-item popover-menu-list-item"><a role="menuitem" data-message-id="{{message_id}}" class="forward_button popover-menu-link" tabindex="0"><i class="popover-menu-icon zulip-icon zulip-icon-forward-message" aria-hidden="true"></i>- <span class="popover-menu-label">{{t "Forward message" }}</span>+ <span class="popover-menu-label">{{forward_message_menu_item}}</span>{{popover_hotkey_hints "<"}}</a></li>diff --git a/web/tests/i18n.test.cjs b/web/tests/i18n.test.cjsindex e13cb1509c9..217e84df5ea 100644--- a/web/tests/i18n.test.cjs+++ b/web/tests/i18n.test.cjs@@ -14,6 +14,7 @@ const {page_params} = require("./lib/zpage_params.cjs");page_params.request_language = "en";page_params.translation_data = {"Quote message": "Citer le message",+ "Copy link to message": "Copier le lien vers le message","Notification triggers": "Déclencheurs de notification","You subscribed to channel {name}": "Vous n'êtes pas abonnés au canal {name}","<p>The channel <b>{name}</b> does not exist.</p><p>Manage your subscriptions <z-link>on your Channels page</z-link>.</p>":@@ -58,9 +59,13 @@ run_test("$t_html", () => {});run_test("t_tag", ({mock_template}) => {+ // The Quote/Forward labels reach this template already translated, so+ // assert on a label the template still translates itself.const args = {message_id: "99",should_display_quote_message: true,+ quote_message_menu_item: "Citer le message",+ forward_message_menu_item: "Transférer le message",editability_menu_item: "Edit message",conversation_time_url:"http://zulip.zulipdev.com/#narrow/channel/101-devel/topic/testing/near/99",@@ -68,7 +73,7 @@ run_test("t_tag", ({mock_template}) => {mock_template("popovers/message_actions_popover.hbs", true, (data, html) => {assert.equal(data, args);- assert.ok(html.includes("Citer le message"));+ assert.ok(html.includes("Copier le lien vers le message"));return "<message-actions-popover-stub>";});diff --git a/web/tests/popover_menus_data.test.cjs b/web/tests/popover_menus_data.test.cjsindex 3d62e0124a9..d1463907e2e 100644--- a/web/tests/popover_menus_data.test.cjs+++ b/web/tests/popover_menus_data.test.cjs@@ -254,6 +254,8 @@ test("my_message_all_actions", ({override}) => {assert.equal(response.should_display_delete_option, true);assert.equal(response.should_display_read_receipts_option, true);assert.equal(response.should_display_quote_message, true);+ assert.equal(response.quote_message_menu_item, "translated: Quote message");+ assert.equal(response.forward_message_menu_item, "translated: Forward message");});test("not_my_message_view_actions", ({override}) => {