Replace "Reply in thread" and "Leave the beta" with variables (matrix…

…-org#8349)
Johennes · Apr 19, 2022 · 09225fc · 09225fc
1 parent 63995f1
commit 09225fc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx
@@ -163,7 +163,9 @@ const EmptyThread: React.FC<EmptyThreadIProps> = ({ hasThreads, filterOption, sh
         body = <>
             <p>{ _t("Threads help keep your conversations on-topic and easy to track.") }</p>
             <p className="mx_ThreadPanel_empty_tip">
-                { _t('<b>Tip:</b> Use "Reply in thread" when hovering over a message.', {}, {
+                { _t('<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.', {
+                    replyInThread: _t("Reply in thread"),
+                }, {
                     b: sub => <b>{ sub }</b>,
                 }) }
             </p>

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -870,9 +870,11 @@
     "Keep discussions organised with threads.": "Keep discussions organised with threads.",
     "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.": "Threads help keep conversations on-topic and easy to track. <a>Learn more</a>.",
     "How can I start a thread?": "How can I start a thread?",
-    "Use \"Reply in thread\" when hovering over a message.": "Use \"Reply in thread\" when hovering over a message.",
+    "Use “%(replyInThread)s” when hovering over a message.": "Use “%(replyInThread)s” when hovering over a message.",
+    "Reply in thread": "Reply in thread",
     "How can I leave the beta?": "How can I leave the beta?",
-    "To leave, return to this page and use the “Leave the beta” button.": "To leave, return to this page and use the “Leave the beta” button.",
+    "To leave, return to this page and use the “%(leaveTheBeta)s” button.": "To leave, return to this page and use the “%(leaveTheBeta)s” button.",
+    "Leave the beta": "Leave the beta",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Thank you for trying the beta, please go into as much detail as you can so we can improve it.",
     "Custom user status messages": "Custom user status messages",
     "Video rooms (under active development)": "Video rooms (under active development)",
@@ -2091,7 +2093,6 @@
     "Error processing audio message": "Error processing audio message",
     "View live location": "View live location",
     "React": "React",
-    "Reply in thread": "Reply in thread",
     "Can't create a thread from an event with an existing relation": "Can't create a thread from an event with an existing relation",
     "Beta feature": "Beta feature",
     "Beta feature. Click to learn more.": "Beta feature. Click to learn more.",
@@ -2910,7 +2911,6 @@
     "This is a beta feature": "This is a beta feature",
     "Click for more info": "Click for more info",
     "Beta": "Beta",
-    "Leave the beta": "Leave the beta",
     "Join the beta": "Join the beta",
     "Live until %(expiryTime)s": "Live until %(expiryTime)s",
     "Loading live location...": "Loading live location...",
@@ -3125,7 +3125,7 @@
     "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.": "Reply to an ongoing thread or use “%(replyInThread)s” when hovering over a message to start a new one.",
     "Show all threads": "Show all threads",
     "Threads help keep your conversations on-topic and easy to track.": "Threads help keep your conversations on-topic and easy to track.",
-    "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.": "<b>Tip:</b> Use \"Reply in thread\" when hovering over a message.",
+    "<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.": "<b>Tip:</b> Use “%(replyInThread)s” when hovering over a message.",
     "Keep discussions organised with threads": "Keep discussions organised with threads",
     "Threads are a beta feature": "Threads are a beta feature",
     "<a>Give feedback</a>": "<a>Give feedback</a>",

diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
@@ -242,9 +242,17 @@ export const SETTINGS: {[setting: string]: ISetting} = {
             disclaimer: () =>
                 SdkConfig.get().bug_report_endpoint_url && <>
                     <h4>{ _t("How can I start a thread?") }</h4>
-                    <p>{ _t("Use \"Reply in thread\" when hovering over a message.") }</p>
+                    <p>
+                        { _t("Use “%(replyInThread)s” when hovering over a message.", {
+                            replyInThread: _t("Reply in thread"),
+                        }) }
+                    </p>
                     <h4>{ _t("How can I leave the beta?") }</h4>
-                    <p>{ _t("To leave, return to this page and use the “Leave the beta” button.") }</p>
+                    <p>
+                        { _t("To leave, return to this page and use the “%(leaveTheBeta)s” button.", {
+                            leaveTheBeta: _t("Leave the beta"),
+                        }) }
+                    </p>
                 </>,
             feedbackLabel: "thread-feedback",
             feedbackSubheading: _td("Thank you for trying the beta, " +