imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consistently use the word "device", rather than "session" or "login", in verification dialog (#7474)

Browse source
This commit is contained in:
Faye Duxovni 2022-01-06 16:57:49 -05:00 • committed by GitHub
parent b3202de814
commit a4fda7e25d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/auth/CompleteSecurity.tsx
View file

@ -69,20 +69,20 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
} else if (phase === Phase.Intro) {
if (lostKeys) {
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
title = _t("Unable to verify this login");
title = _t("Unable to verify this device");
} else {
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
title = _t("Verify this login");
title = _t("Verify this device");
}
} else if (phase === Phase.Done) {
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
title = _t("Session verified");
title = _t("Device verified");
} else if (phase === Phase.ConfirmSkip) {
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
title = _t("Are you sure?");
} else if (phase === Phase.Busy) {
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
title = _t("Verify this login");
title = _t("Verify this device");
} else if (phase === Phase.ConfirmReset) {
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
title = _t("Really reset verification keys?");

6
src/components/structures/auth/SetupEncryptionBody.tsx
View file

@ -198,7 +198,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
let verifyButton;
if (store.hasDevicesToVerifyAgainst) {
verifyButton = <AccessibleButton kind="primary" onClick={this.onVerifyClick}>
{ _t("Verify with another login") }
{ _t("Verify with another device") }
</AccessibleButton>;
}
@ -227,12 +227,12 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
let message;
if (this.state.backupInfo) {
message = <p>{ _t(
"Your new session is now verified. It has access to your " +
"Your new device is now verified. It has access to your " +
"encrypted messages, and other users will see it as trusted.",
) }</p>;
} else {
message = <p>{ _t(
"Your new session is now verified. Other users will see it as trusted.",
"Your new device is now verified. Other users will see it as trusted.",
) }</p>;
}
return (

2
src/components/views/dialogs/VerificationRequestDialog.tsx
View file

@ -55,7 +55,7 @@ export default class VerificationRequestDialog extends React.Component<IProps, I
const member = this.props.member ||
otherUserId && MatrixClientPeg.get().getUser(otherUserId);
const title = request && request.isSelfVerification ?
_t("Verify other login") : _t("Verification Request");
_t("Verify other device") : _t("Verification Request");
return <BaseDialog
className="mx_InfoDialog"

2
src/components/views/right_panel/EncryptionInfo.tsx
View file

@ -52,7 +52,7 @@ const EncryptionInfo: React.FC<IProps> = ({
if (waitingForOtherParty && isSelfVerification) {
content = (
<div>
{ _t("To proceed, please accept the verification request on your other login.") }
{ _t("To proceed, please accept the verification request on your other device.") }
</div>
);
} else if (waitingForOtherParty || waitingForNetwork) {

8
src/components/views/right_panel/VerificationPanel.tsx
View file

@ -68,7 +68,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
const noCommonMethodError: JSX.Element = !showSAS && !showQR ?
<p>{ _t(
"The session you are trying to verify doesn't support scanning a " +
"The device you are trying to verify doesn't support scanning a " +
"QR code or emoji verification, which is what %(brand)s supports. Try " +
"with a different client.",
{ brand },
@ -101,7 +101,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
<div className='mx_VerificationPanel_QRPhase_betweenText'>{ _t("or") }</div> : null;
return (
<div>
{ _t("Verify this session by completing one of the following:") }
{ _t("Verify this device by completing one of the following:") }
<div className='mx_VerificationPanel_QRPhase_startOptions'>
{ qrBlockDialog }
{ or }
@ -178,7 +178,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
private renderQRReciprocatePhase() {
const { member, request } = this.props;
const description = request.isSelfVerification ?
_t("Almost there! Is your other session showing the same shield?") :
_t("Almost there! Is your other device showing the same shield?") :
_t("Almost there! Is %(displayName)s showing the same shield?", {
displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
});
@ -273,7 +273,7 @@ export default class VerificationPanel extends React.PureComponent<IProps, IStat
text = _t("Verification timed out.") + ` ${startAgainInstruction}`;
} else if (request.cancellingUserId === request.otherUserId) {
if (request.isSelfVerification) {
text = _t("You cancelled verification on your other session.");
text = _t("You cancelled verification on your other device.");
} else {
text = _t("%(displayName)s cancelled verification.", {
displayName: (member as User).displayName || (member as RoomMember).name || member.userId,

8
src/components/views/verification/VerificationShowSas.tsx
View file

@ -92,7 +92,7 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
</div>;
sasCaption = this.props.isSelf ?
_t(
"Confirm the emoji below are displayed on both sessions, in the same order:",
"Confirm the emoji below are displayed on both devices, in the same order:",
):
_t(
"Verify this user by confirming the following emoji appear on their screen.",
@ -106,7 +106,7 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
</div>;
sasCaption = this.props.isSelf ?
_t(
"Verify this session by confirming the following number appears on its screen.",
"Verify this device by confirming the following number appears on its screen.",
):
_t(
"Verify this user by confirming the following number appears on their screen.",
@ -126,12 +126,12 @@ export default class VerificationShowSas extends React.Component<IProps, IState>
// device shouldn't be null in this situation but it can be, eg. if the device is
// logged out during verification
if (this.props.device) {
text = _t("Waiting for you to verify on your other session, %(deviceName)s (%(deviceId)s)…", {
text = _t("Waiting for you to verify on your other device, %(deviceName)s (%(deviceId)s)…", {
deviceName: this.props.device ? this.props.device.getDisplayName() : '',
deviceId: this.props.device ? this.props.device.deviceId : '',
});
} else {
text = _t("Waiting for you to verify on your other session…");
text = _t("Waiting for you to verify on your other device…");
}
confirm = <p>{ text }</p>;
} else if (this.state.pending || this.state.cancelling) {