From ccbdbe4e3bc816abd5973ebad5c0ef555d25a075 Mon Sep 17 00:00:00 2001
From: Julia Bichler <julia.bichler@tum.de>
Date: Fri, 15 Jul 2022 19:24:58 +0200
Subject: [PATCH] message-editing: Reword move message menu.

---
 static/styles/zulip.css                                   | 2 +-
 static/templates/message_edit_form.hbs                    | 6 +++---
 .../zerver/help/include/move-content-subset-options.md    | 8 --------
 templates/zerver/help/move-content-to-another-stream.md   | 4 +---
 templates/zerver/help/move-content-to-another-topic.md    | 4 +---
 5 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 templates/zerver/help/include/move-content-subset-options.md

diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index d8509fb62f..0c8746d9c8 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -1529,7 +1529,7 @@ div.focused_table {
 
 .message_edit_topic_propagate {
     display: inline-block;
-    width: 300px;
+    width: 320px;
     margin-bottom: 15px !important;
     max-width: 100%;
 }
diff --git a/static/templates/message_edit_form.hbs b/static/templates/message_edit_form.hbs
index c2f01df660..de07999f5b 100644
--- a/static/templates/message_edit_form.hbs
+++ b/static/templates/message_edit_form.hbs
@@ -31,9 +31,9 @@
                 </div>
             </div>
             <select class='message_edit_topic_propagate' style='display:none;'>
-                <option selected="selected" value="change_later"> {{t "Change later messages to this topic" }}</option>
-                <option value="change_one"> {{t "Change only this message topic" }}</option>
-                <option value="change_all"> {{t "Change previous and following messages to this topic" }}</option>
+                <option selected="selected" value="change_one"> {{t "Move only this message" }}</option>
+                <option value="change_later"> {{t "Move this and all following messages in this topic" }}</option>
+                <option value="change_all"> {{t "Move all messages in this topic" }}</option>
             </select>
         </div>
     </div>
diff --git a/templates/zerver/help/include/move-content-subset-options.md b/templates/zerver/help/include/move-content-subset-options.md
deleted file mode 100644
index 36456e1126..0000000000
--- a/templates/zerver/help/include/move-content-subset-options.md
+++ /dev/null
@@ -1,8 +0,0 @@
-    - **Change later messages to this topic**, which will move both
-      the selected message and all following messages.
-
-    - **Change only this message topic**, which will only move the
-      selected message.
-
-    - **Change previous and following messages to this topic**, which
-      will move all messages in the topic.
diff --git a/templates/zerver/help/move-content-to-another-stream.md b/templates/zerver/help/move-content-to-another-stream.md
index c6845e256f..70ffa079e4 100644
--- a/templates/zerver/help/move-content-to-another-stream.md
+++ b/templates/zerver/help/move-content-to-another-stream.md
@@ -57,9 +57,7 @@ destination streams.
 
 1. Toggle whether automated notification messages should be sent.
 
-1. From the dropdown menu, select which messages to move:
-
-{!move-content-subset-options.md!}
+1. From the dropdown menu, select which messages to move.
 
 1. Click **Save**.
 
diff --git a/templates/zerver/help/move-content-to-another-topic.md b/templates/zerver/help/move-content-to-another-topic.md
index 2ed07e5848..134f0a54ed 100644
--- a/templates/zerver/help/move-content-to-another-topic.md
+++ b/templates/zerver/help/move-content-to-another-topic.md
@@ -28,9 +28,7 @@ for the details on when topic editing is allowed.
 
 1. Set the destination topic.
 
-1. From the dropdown menu, select which messages to move:
-
-{!move-content-subset-options.md!}
+1. From the dropdown menu, select which messages to move.
 
 1. Click **Save**.