From b91f0ed7ba745d4a7f9e36e86fb12e64b77dda4e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 6 Sep 2022 13:27:36 +0100 Subject: [PATCH] Improve partial translation `or` to have usage context (#9244) --- .../dialogs/security/CreateSecretStorageDialog.tsx | 5 ++++- src/components/views/dialogs/AppDownloadDialog.tsx | 10 ++++++++-- .../dialogs/security/AccessSecretStorageDialog.tsx | 5 ++++- src/components/views/right_panel/VerificationPanel.tsx | 7 ++++++- src/i18n/strings/en_EN.json | 5 ++++- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx index 27c970430a9..2953d795655 100644 --- a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx +++ b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx @@ -725,7 +725,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent { _t("Download") } - { _t("or") } + { _t("%(downloadButton)s or %(copyButton)s", { + downloadButton: "", + copyButton: "", + }) } = ({ onFinished }: IDialogProps { _t("iOS") } -
or
+
{ _t("%(qrCode)s or %(appLinks)s", { + appLinks: "", + qrCode: "", + }) }
= ({ onFinished }: IDialogProps { _t("Android") } -
or
+
{ _t("%(qrCode)s or %(appLinks)s", { + appLinks: "", + qrCode: "", + }) }
- { _t("or") } + { _t("%(securityKey)s or %(recoveryFile)s", { + recoveryFile: "", + securityKey: "", + }) }
; } const or = qrBlockDialog && sasBlockDialog ? -
{ _t("or") }
: null; +
+ { _t("%(qrCode)s or %(emojiCompare)s", { + emojiCompare: "", + qrCode: "", + }) } +
: null; return (
{ _t("Verify this device by completing one of the following:") } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 070fb79b4db..6afb549b160 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2135,7 +2135,7 @@ "Compare unique emoji": "Compare unique emoji", "Compare a unique set of emoji if you don't have a camera on either device": "Compare a unique set of emoji if you don't have a camera on either device", "Start": "Start", - "or": "or", + "%(qrCode)s or %(emojiCompare)s": "%(qrCode)s or %(emojiCompare)s", "Verify this device by completing one of the following:": "Verify this device by completing one of the following:", "Verify by scanning": "Verify by scanning", "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:", @@ -2506,6 +2506,7 @@ "You can turn this off anytime in settings": "You can turn this off anytime in settings", "Download %(brand)s Desktop": "Download %(brand)s Desktop", "iOS": "iOS", + "%(qrCode)s or %(appLinks)s": "%(qrCode)s or %(appLinks)s", "Download on the App Store": "Download on the App Store", "Android": "Android", "Get it on Google Play": "Get it on Google Play", @@ -2938,6 +2939,7 @@ "Enter your Security Phrase or to continue.": "Enter your Security Phrase or to continue.", "Security Key": "Security Key", "Use your Security Key to continue.": "Use your Security Key to continue.", + "%(securityKey)s or %(recoveryFile)s": "%(securityKey)s or %(recoveryFile)s", "Destroy cross-signing keys?": "Destroy cross-signing keys?", "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.", "Clear cross-signing keys": "Clear cross-signing keys", @@ -3420,6 +3422,7 @@ "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.", "Enter a security phrase only you know, as it's used to safeguard your data. To be secure, you shouldn't re-use your account password.": "Enter a security phrase only you know, as it's used to safeguard your data. To be secure, you shouldn't re-use your account password.", "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.": "Store your Security Key somewhere safe, like a password manager or a safe, as it's used to safeguard your encrypted data.", + "%(downloadButton)s or %(copyButton)s": "%(downloadButton)s or %(copyButton)s", "Unable to query secret storage status": "Unable to query secret storage status", "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.", "You can also set up Secure Backup & manage your keys in Settings.": "You can also set up Secure Backup & manage your keys in Settings.",