Replace "Reply in thread" and "Leave the beta" with variables (#8349)

pull/28217/head
Suguru Hirahara 2022-04-19 08:43:35 +00:00 committed by GitHub
parent 2b91ed1084
commit c68515ae0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions

View File

@ -163,7 +163,9 @@ const EmptyThread: React.FC<EmptyThreadIProps> = ({ hasThreads, filterOption, sh
body = <> body = <>
<p>{ _t("Threads help keep your conversations on-topic and easy to track.") }</p> <p>{ _t("Threads help keep your conversations on-topic and easy to track.") }</p>
<p className="mx_ThreadPanel_empty_tip"> <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>, b: sub => <b>{ sub }</b>,
}) } }) }
</p> </p>

View File

@ -870,9 +870,11 @@
"Keep discussions organised with threads.": "Keep discussions organised with threads.", "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>.", "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?", "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?", "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.", "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", "Custom user status messages": "Custom user status messages",
"Video rooms (under active development)": "Video rooms (under active development)", "Video rooms (under active development)": "Video rooms (under active development)",
@ -2090,7 +2092,6 @@
"Error processing audio message": "Error processing audio message", "Error processing audio message": "Error processing audio message",
"View live location": "View live location", "View live location": "View live location",
"React": "React", "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", "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": "Beta feature",
"Beta feature. Click to learn more.": "Beta feature. Click to learn more.", "Beta feature. Click to learn more.": "Beta feature. Click to learn more.",
@ -2909,7 +2910,6 @@
"This is a beta feature": "This is a beta feature", "This is a beta feature": "This is a beta feature",
"Click for more info": "Click for more info", "Click for more info": "Click for more info",
"Beta": "Beta", "Beta": "Beta",
"Leave the beta": "Leave the beta",
"Join the beta": "Join the beta", "Join the beta": "Join the beta",
"Live until %(expiryTime)s": "Live until %(expiryTime)s", "Live until %(expiryTime)s": "Live until %(expiryTime)s",
"Loading live location...": "Loading live location...", "Loading live location...": "Loading live location...",
@ -3124,7 +3124,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.", "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", "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.", "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", "Keep discussions organised with threads": "Keep discussions organised with threads",
"Threads are a beta feature": "Threads are a beta feature", "Threads are a beta feature": "Threads are a beta feature",
"<a>Give feedback</a>": "<a>Give feedback</a>", "<a>Give feedback</a>": "<a>Give feedback</a>",

View File

@ -242,9 +242,17 @@ export const SETTINGS: {[setting: string]: ISetting} = {
disclaimer: () => disclaimer: () =>
SdkConfig.get().bug_report_endpoint_url && <> SdkConfig.get().bug_report_endpoint_url && <>
<h4>{ _t("How can I start a thread?") }</h4> <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> <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", feedbackLabel: "thread-feedback",
feedbackSubheading: _td("Thank you for trying the beta, " + feedbackSubheading: _td("Thank you for trying the beta, " +