OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve partial translation `or` to have usage context (#9244)

pull/28788/head^2
Michael Telatynski 2022-09-06 13:27:36 +01:00 committed by GitHub
parent 9f5857dd38
commit b91f0ed7ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
View File

@ -725,7 +725,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
>
{ _t("Download") }
</AccessibleButton>
<span>{ _t("or") }</span>
<span>{ _t("%(downloadButton)s or %(copyButton)s", {
downloadButton: "",
copyButton: "",
}) }</span>
<AccessibleButton
kind='primary'
className="mx_Dialog_primary mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn"

10
src/components/views/dialogs/AppDownloadDialog.tsx
View File

@ -69,7 +69,10 @@ export const AppDownloadDialog: FC<IDialogProps> = ({ onFinished }: IDialogProps
{ _t("iOS") }
</Heading>
<QRCode data={urlAppStore} margin={0} width={172} />
<div className="mx_AppDownloadDialog_info">or</div>
<div className="mx_AppDownloadDialog_info">{ _t("%(qrCode)s or %(appLinks)s", {
appLinks: "",
qrCode: "",
}) }</div>
<div className="mx_AppDownloadDialog_links">
<AccessibleButton
element="a"
@ -86,7 +89,10 @@ export const AppDownloadDialog: FC<IDialogProps> = ({ onFinished }: IDialogProps
{ _t("Android") }
</Heading>
<QRCode data={urlAndroid} margin={0} width={172} />
<div className="mx_AppDownloadDialog_info">or</div>
<div className="mx_AppDownloadDialog_info">{ _t("%(qrCode)s or %(appLinks)s", {
appLinks: "",
qrCode: "",
}) }</div>
<div className="mx_AppDownloadDialog_links">
<AccessibleButton
element="a"

5
src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
View File

@ -395,7 +395,10 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
/>
</div>
<span className="mx_AccessSecretStorageDialog_recoveryKeyEntry_entryControlSeparatorText">
{ _t("or") }
{ _t("%(securityKey)s or %(recoveryFile)s", {
recoveryFile: "",
securityKey: "",
}) }
</span>
<div>
<input type="file"

7
src/components/views/right_panel/VerificationPanel.tsx
View File

@ -100,7 +100,12 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
</div>;
}
const or = qrBlockDialog && sasBlockDialog ?
<div className='mx_VerificationPanel_QRPhase_betweenText'>{ _t("or") }</div> : null;
<div className='mx_VerificationPanel_QRPhase_betweenText'>
{ _t("%(qrCode)s or %(emojiCompare)s", {
emojiCompare: "",
qrCode: "",
}) }
</div> : null;
return (
<div>
{ _t("Verify this device by completing one of the following:") }

5
src/i18n/strings/en_EN.json
View File

@ -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 <button>use your Security Key</button> to continue.": "Enter your Security Phrase or <button>use your Security Key</button> 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.",