message_quoting: Rename 'Quote and reply' to 'Quote message'.

'Quote message' is a more accurate decription, as this option inserts
the quoted text into whatever message you're composing or editing;
it does not necessarily start a new reply.

Fixes first part of #31953.

docs/testing/manual-testing.md

@@ -98,7 +98,7 @@ the hotkeys too:
 - Message reply:
   - click on message to reply
   - use 'r' or Return hotkey to reply
-  - use '>' to quote and reply
+  - use '>' to quote message
   - use '@' to mention and reply
 - Reactions:
   - click on the reactions button to open menu

help/code-blocks.md

@@ -191,7 +191,7 @@ be happy to help you out.
 * [Message formatting](/help/format-your-message-using-markdown)
 * [LaTeX](/help/latex)
 * [Spoilers](/help/spoilers)
-* [Quote and reply](/help/quote-and-reply)
+* [Quote message](/help/quote-and-reply)
 
 [pygments-lexers]: https://pygments.org/docs/lexers/
 [get_lexer_by_name]: https://pygments-doc.readthedocs.io/en/latest/lexers/lexers.html#pygments.lexers.get_lexer_by_name

help/format-a-quote.md

@@ -48,4 +48,4 @@ quote in two paragraphs
 ## Related articles
 
 * [Message formatting](/help/format-your-message-using-markdown)
-* [Quote and reply](/help/quote-and-reply)
+* [Quote message](/help/quote-and-reply)

help/format-your-message-using-markdown.md

@@ -114,7 +114,7 @@ below.
 
 !!! tip ""
 
-    There is a handy option to [quote and reply](/help/quote-and-reply) to a
+    There is a handy option to [quote message](/help/quote-and-reply) to a
     message in Zulip.
     You can also use the **Quote** (<i class="zulip-icon zulip-icon-quote"></i>)
     button in the compose box to insert quote formatting.

help/include/sidebar_index.md

@@ -63,7 +63,7 @@
 * [Mention a user or group](/help/mention-a-user-or-group)
 * [Link to a channel, topic, or message](/help/link-to-a-message-or-conversation)
 * [Format a quote](/help/format-a-quote)
-* [Quote and reply](/help/quote-and-reply)
+* [Quote message](/help/quote-and-reply)
 * [Emoji and emoticons](/help/emoji-and-emoticons)
 * [Insert a link](/help/insert-a-link)
 * [Share and upload files](/help/share-and-upload-files)

help/keyboard-shortcuts.md

@@ -131,7 +131,7 @@ in the Zulip app to add more to your repertoire as needed.
   selected message (outlined in blue). Same behavior as clicking on the
   message.
 
-* **Quote and reply to message**: <kbd>></kbd>
+* **Quote message**: <kbd>></kbd>
 
 * **Reply directly to sender**: <kbd>Shift</kbd> + <kbd>R</kbd>
 

help/mention-a-user-or-group.md

@@ -95,5 +95,5 @@ channels](/help/channel-notifications).
 
 * [Message formatting](/help/format-your-message-using-markdown)
 * [Restrict wildcard mentions](/help/restrict-wildcard-mentions)
-* [Quote and reply](/help/quote-and-reply)
+* [Quote message](/help/quote-and-reply)
 * [View your mentions](/help/view-your-mentions)

help/quote-and-reply.md

@@ -1,4 +1,4 @@
-# Quote and reply
+# Quote message
 
 You can quote a previous message, either replying within a topic or to
 start a new topic.
@@ -13,7 +13,7 @@ to avoid unnecessarily mentioning someone twice.
     You can use [quote blocks](/help/format-a-quote)
     when quoting emails or other non-Zulip content.
 
-## Quote and reply
+## Quote message
 
 {start_tabs}
 
@@ -24,20 +24,20 @@ to avoid unnecessarily mentioning someone twice.
 
 {!message-actions-menu.md!}
 
-1. Click **Quote and reply**.
+1. Click **Quote message**.
 
 1. Send your message.
 
 !!! keyboard_tip ""
 
-    You can also use <kbd>></kbd> to **quote and reply** to the
+    You can also use <kbd>></kbd> to quote to the
     selected message.
 
 {tab|mobile}
 
 {!message-long-press-menu.md!}
 
-1. Tap **Quote and reply**.
+1. Tap **Quote message**.
 
 1. *(optional)* Delete any parts of the quoted message that are not
    relevant to your reply.
@@ -57,7 +57,7 @@ to avoid unnecessarily mentioning someone twice.
 
 {!message-actions-menu.md!}
 
-1. Click **Quote and reply**.
+1. Click **Quote message**.
 
 1. Select the desired destination channel or **Direct message** from the dropdown
    in the top left of the compose box.
@@ -74,7 +74,7 @@ to avoid unnecessarily mentioning someone twice.
 
 {!message-long-press-menu.md!}
 
-1. Tap **Quote and reply**.
+1. Tap **Quote message**.
 
 1. *(optional)* Delete any parts of the quoted message that you don't want to
    forward.

help/replying-to-messages.md

@@ -7,5 +7,5 @@
 * [Getting started with Zulip](/help/getting-started-with-zulip)
 * [Introduction to topics](/help/introduction-to-topics)
 * [Starting a new direct message](/help/starting-a-new-direct-message)
-* [Quote and reply](/help/quote-and-reply)
+* [Quote message](/help/quote-and-reply)
 * [Messaging tips & tricks](/help/messaging-tips)

web/shared/icons/quote-message.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path fill="#000" d="M2.032 4.662a1.636 1.636 0 1 1-1.227.475l1.612-2.725a.409.409 0 1 1 .703.41l-1.088 1.84Zm2.864.475h-.008l1.62-2.725a.409.409 0 0 1 .703.418L6.123 4.662a1.637 1.637 0 1 1-.082 3.273 1.636 1.636 0 0 1-1.145-2.798Zm7.509 4.598a1.636 1.636 0 1 1 2.782 1.154l-1.612 2.732a.41.41 0 1 1-.704-.417l1.088-1.84a1.636 1.636 0 0 1-1.554-1.637v.008Zm-1.31 1.154h.009l-1.62 2.724a.41.41 0 0 1-.704-.409l1.088-1.833A1.636 1.636 0 1 1 9.95 8.1a1.636 1.636 0 0 1 1.146 2.79Z"/></svg>

web/templates/keyboard_shortcuts.hbs

@@ -213,7 +213,7 @@
                     <td><span class="hotkey"><kbd>Enter</kbd> or <kbd>R</kbd></span></td>
                 </tr>
                 <tr>
-                    <td class="definition">{{t 'Quote and reply to message' }}</td>
+                    <td class="definition">{{t 'Quote message' }}</td>
                     <td><span class="hotkey"><kbd>></kbd></span></td>
                 </tr>
                 <tr>

web/templates/popovers/message_actions_popover.hbs

@@ -4,8 +4,8 @@
         {{#if should_display_quote_and_reply}}
         <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-and-reply" aria-hidden="true"></i>
+                <i class="popover-menu-icon zulip-icon zulip-icon-quote-message" aria-hidden="true"></i>
-                <span class="popover-menu-label">{{t "Quote and reply" }}</span>
+                <span class="popover-menu-label">{{t "Quote message" }}</span>
                 {{popover_hotkey_hints ">"}}
             </a>
         </li>

web/tests/i18n.test.cjs

@@ -13,7 +13,7 @@ const {page_params} = require("./lib/zpage_params.cjs");
 // that here for the tests.
 page_params.request_language = "en";
 page_params.translation_data = {
-    "Quote and reply": "Citer et répondre",
+    "Quote message": "Citer 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>":
@@ -34,10 +34,7 @@ const {$t, $t_html, get_language_name, get_language_list_columns, initialize} =
 run_test("$t", () => {
     // Normally the id would be provided by babel-plugin-formatjs, but
     // this test file is not processed by Babel.
-    assert.equal(
+    assert.equal($t({id: "Quote message", defaultMessage: "Quote message"}), "Citer le message");
-        $t({id: "Quote and reply", defaultMessage: "Quote and reply"}),
-        "Citer et répondre",
-    );
     assert.equal(
         $t(
             {
@@ -79,7 +76,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 et répondre"));
+        assert.ok(html.includes("Citer le message"));
     });
 
     require("../templates/popovers/message_actions_popover.hbs")(args);