Fix instances of double translation and guard translation calls using typescript (#11443)
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
This commit is contained in:
parent
d13b6e1b41
commit
ac70f7ac9b
157 changed files with 554 additions and 780 deletions
|
@ -354,14 +354,12 @@ export default class ForgotPassword extends React.Component<Props, State> {
|
|||
<div>
|
||||
<p>
|
||||
{_t(
|
||||
"Signing out your devices will delete the message encryption keys stored on them, " +
|
||||
"making encrypted chat history unreadable.",
|
||||
"Signing out your devices will delete the message encryption keys stored on them, making encrypted chat history unreadable.",
|
||||
)}
|
||||
</p>
|
||||
<p>
|
||||
{_t(
|
||||
"If you want to retain access to your chat history in encrypted rooms, set up Key Backup " +
|
||||
"or export your message keys from one of your other devices before proceeding.",
|
||||
"If you want to retain access to your chat history in encrypted rooms, set up Key Backup or export your message keys from one of your other devices before proceeding.",
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
|
@ -443,9 +441,7 @@ export default class ForgotPassword extends React.Component<Props, State> {
|
|||
{this.state.logoutDevices ? (
|
||||
<p>
|
||||
{_t(
|
||||
"You have been logged out of all devices and will no longer receive " +
|
||||
"push notifications. To re-enable notifications, sign in again on each " +
|
||||
"device.",
|
||||
"You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.",
|
||||
)}
|
||||
</p>
|
||||
) : null}
|
||||
|
|
|
@ -622,8 +622,7 @@ export default class Registration extends React.Component<IProps, IState> {
|
|||
<div>
|
||||
<p>
|
||||
{_t(
|
||||
"Your new account (%(newAccountId)s) is registered, but you're already " +
|
||||
"logged into a different account (%(loggedInUserId)s).",
|
||||
"Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
|
||||
{
|
||||
newAccountId: this.state.registeredUsername,
|
||||
loggedInUserId: this.state.differentLoggedInUserId,
|
||||
|
|
|
@ -161,10 +161,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
|
|||
<div>
|
||||
<p>
|
||||
{_t(
|
||||
"It looks like you don't have a Security Key or any other devices you can " +
|
||||
"verify against. This device will not be able to access old encrypted messages. " +
|
||||
"In order to verify your identity on this device, you'll need to reset " +
|
||||
"your verification keys.",
|
||||
"It looks like you don't have a Security Key or any other devices you can verify against. This device will not be able to access old encrypted messages. In order to verify your identity on this device, you'll need to reset your verification keys.",
|
||||
)}
|
||||
</p>
|
||||
|
||||
|
@ -234,8 +231,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
|
|||
message = (
|
||||
<p>
|
||||
{_t(
|
||||
"Your new device is now verified. It has access to your " +
|
||||
"encrypted messages, and other users will see it as trusted.",
|
||||
"Your new device is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
|
||||
)}
|
||||
</p>
|
||||
);
|
||||
|
@ -258,8 +254,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
|
|||
<div>
|
||||
<p>
|
||||
{_t(
|
||||
"Without verifying, you won't have access to all your messages " +
|
||||
"and may appear as untrusted to others.",
|
||||
"Without verifying, you won't have access to all your messages and may appear as untrusted to others.",
|
||||
)}
|
||||
</p>
|
||||
<div className="mx_CompleteSecurity_actionRow">
|
||||
|
@ -277,16 +272,12 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
|
|||
<div>
|
||||
<p>
|
||||
{_t(
|
||||
"Resetting your verification keys cannot be undone. After resetting, " +
|
||||
"you won't have access to old encrypted messages, and any friends who " +
|
||||
"have previously verified you will see security warnings until you " +
|
||||
"re-verify with them.",
|
||||
"Resetting your verification keys cannot be undone. After resetting, you won't have access to old encrypted messages, and any friends who have previously verified you will see security warnings until you re-verify with them.",
|
||||
)}
|
||||
</p>
|
||||
<p>
|
||||
{_t(
|
||||
"Please only proceed if you're sure you've lost all of your other " +
|
||||
"devices and your Security Key.",
|
||||
"Please only proceed if you're sure you've lost all of your other devices and your Security Key.",
|
||||
)}
|
||||
</p>
|
||||
|
||||
|
|
|
@ -281,8 +281,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
|
|||
let introText: string | null = null; // null is translated to something area specific in this function
|
||||
if (this.state.keyBackupNeeded) {
|
||||
introText = _t(
|
||||
"Regain access to your account and recover encryption keys stored in this session. " +
|
||||
"Without them, you won't be able to read all of your secure messages in any session.",
|
||||
"Regain access to your account and recover encryption keys stored in this session. Without them, you won't be able to read all of your secure messages in any session.",
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -329,10 +328,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
|
|||
// Default: assume unsupported/error
|
||||
return (
|
||||
<p>
|
||||
{_t(
|
||||
"You cannot sign in to your account. Please contact your " +
|
||||
"homeserver admin for more information.",
|
||||
)}
|
||||
{_t("You cannot sign in to your account. Please contact your homeserver admin for more information.")}
|
||||
</p>
|
||||
);
|
||||
}
|
||||
|
@ -350,9 +346,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
|
|||
<h2>{_t("Clear personal data")}</h2>
|
||||
<p>
|
||||
{_t(
|
||||
"Warning: your personal data (including encryption keys) is still stored " +
|
||||
"in this session. Clear it if you're finished using this session, or want to sign " +
|
||||
"in to another account.",
|
||||
"Warning: your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.",
|
||||
)}
|
||||
</p>
|
||||
<div>
|
||||
|
|
|
@ -54,8 +54,7 @@ export const VerifyEmailModal: React.FC<Props> = ({
|
|||
<h1>{_t("Verify your email to continue")}</h1>
|
||||
<p>
|
||||
{_t(
|
||||
"We need to know it’s you before resetting your password. " +
|
||||
"Click the link in the email we just sent to <b>%(email)s</b>",
|
||||
"We need to know it’s you before resetting your password. Click the link in the email we just sent to <b>%(email)s</b>",
|
||||
{
|
||||
email,
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue