Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

popovers: Shorten 'Quote or reply' label. 

This removes the previous "or forward" text from the message
actions popover, and keeps the documentation in sync with the
new text. Internationalization tests are updated, too.

Fixes #25603.
This commit is contained in:
Karl Stolley 2023-05-15 13:55:42 -05:00 committed by Tim Abbott
parent e6c7363613
commit 386d87635e
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
help/quote-and-reply.md
View File

@ -21,7 +21,7 @@ to avoid unnecessarily mentioning someone twice.
{!message-actions-menu.md!} {!message-actions-menu.md!}
1. Click **Quote and reply or forward**. 1. Click **Quote and reply**.
1. *(optional)* Delete any parts of the quoted message that are not 1. *(optional)* Delete any parts of the quoted message that are not
relevant to your reply. relevant to your reply.
@ -30,7 +30,7 @@ to avoid unnecessarily mentioning someone twice.
!!! keyboard_tip "" !!! keyboard_tip ""
You can also use <kbd>></kbd> to **quote and reply or forward** the You can also use <kbd>></kbd> to **quote and reply** to the
selected message. selected message.
{tab|mobile} {tab|mobile}
@ -54,7 +54,7 @@ to avoid unnecessarily mentioning someone twice.
{!message-actions-menu.md!} {!message-actions-menu.md!}
1. Click **Quote and reply or forward**. 1. Click **Quote and reply**.
1. *(optional)* Delete any parts of the quoted message that you don't want to 1. *(optional)* Delete any parts of the quoted message that you don't want to
forward. forward.
@ -68,8 +68,7 @@ to avoid unnecessarily mentioning someone twice.
!!! keyboard_tip "" !!! keyboard_tip ""
You can also use <kbd>></kbd> to **quote and reply or forward** the You can also use <kbd>></kbd> to forward the selected message.
selected message.
{tab|mobile} {tab|mobile}

2
web/templates/actions_popover_content.hbs
View File

@ -3,7 +3,7 @@
{{#if should_display_quote_and_reply}} {{#if should_display_quote_and_reply}}
<li> <li>
<a class="respond_button" data-message-id="{{message_id}}" tabindex="0"> <a class="respond_button" data-message-id="{{message_id}}" tabindex="0">
<i class="fa fa-reply" aria-hidden="true"></i> {{t "Quote and reply or forward" }} <i class="fa fa-reply" aria-hidden="true"></i> {{t "Quote and reply" }}
<span class="hotkey-hint">(>)</span> <span class="hotkey-hint">(>)</span>
</a> </a>
</li> </li>

8
web/tests/i18n.test.js
View File

@ -13,7 +13,7 @@ const {page_params} = require("./lib/zpage_params");
// that here for the tests. // that here for the tests.
page_params.request_language = "en"; page_params.request_language = "en";
page_params.translation_data = { page_params.translation_data = {
"Quote and reply or forward": "Citer et répondre ou transférer", "Quote and reply": "Citer et répondre",
"Notification triggers": "Déclencheurs de notification", "Notification triggers": "Déclencheurs de notification",
"You subscribed to stream {stream}": "Vous n'êtes pas abonnés au canal {stream}", "You subscribed to stream {stream}": "Vous n'êtes pas abonnés au canal {stream}",
"<p>The stream <b>{stream_name}</b> does not exist.</p><p>Manage your subscriptions <z-link>on your Streams page</z-link>.</p>": "<p>The stream <b>{stream_name}</b> does not exist.</p><p>Manage your subscriptions <z-link>on your Streams page</z-link>.</p>":
@ -35,8 +35,8 @@ run_test("$t", () => {
// Normally the id would be provided by babel-plugin-formatjs, but // Normally the id would be provided by babel-plugin-formatjs, but
// this test file is not processed by Babel. // this test file is not processed by Babel.
assert.equal( assert.equal(
$t({id: "Quote and reply or forward", defaultMessage: "Quote and reply or forward"}), $t({id: "Quote and reply", defaultMessage: "Quote and reply"}),
"Citer et répondre ou transférer", "Citer et répondre",
); );
assert.equal( assert.equal(
$t( $t(
@ -79,7 +79,7 @@ run_test("t_tag", ({mock_template}) => {
mock_template("actions_popover_content.hbs", true, (data, html) => { mock_template("actions_popover_content.hbs", true, (data, html) => {
assert.equal(data, args); assert.equal(data, args);
assert.ok(html.indexOf("Citer et répondre ou transférer") > 0); assert.ok(html.indexOf("Citer et répondre") > 0);
}); });
require("../templates/actions_popover_content.hbs")(args); require("../templates/actions_popover_content.hbs")(args);