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

Update copy when the user verifies their own devices

pull/21833/head
Zoe 2020-01-30 15:58:23 +00:00
parent 767015d19d
commit 9f5f15d1d3
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/views/dialogs/IncomingSasDialog.js
View File

@ -121,6 +121,8 @@ export default class IncomingSasDialog extends React.Component {
const Spinner = sdk.getComponent("views.elements.Spinner"); const Spinner = sdk.getComponent("views.elements.Spinner");
const BaseAvatar = sdk.getComponent("avatars.BaseAvatar"); const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
const isSelf = this.props.verifier.userId == MatrixClientPeg.get().credentials.userId;
let profile; let profile;
if (this.state.opponentProfile) { if (this.state.opponentProfile) {
profile = <div className="mx_IncomingSasDialog_opponentProfile"> profile = <div className="mx_IncomingSasDialog_opponentProfile">
@ -148,20 +150,36 @@ export default class IncomingSasDialog extends React.Component {
profile = <Spinner />; profile = <Spinner />;
} }
return ( const userDetailText = [
<div>
{profile}
<p>{_t( <p>{_t(
"Verify this user to mark them as trusted. " + "Verify this user to mark them as trusted. " +
"Trusting users gives you extra peace of mind when using " + "Trusting users gives you extra peace of mind when using " +
"end-to-end encrypted messages.", "end-to-end encrypted messages.",
)}</p> )}</p>,
<p>{_t( <p>{_t(
// NB. Below wording adjusted to singular 'session' until we have // NB. Below wording adjusted to singular 'session' until we have
// cross-signing // cross-signing
"Verifying this user will mark their session as trusted, and " + "Verifying this user will mark their session as trusted, and " +
"also mark your session as trusted to them.", "also mark your session as trusted to them.",
)}</p> )}</p>
];
const selfDetailText = [
<p>{_t(
"Verify this device to mark it as trusted. " +
"Trusting this device gives you and other users extra peace of mind when using " +
"end-to-end encrypted messages.",
)}</p>,
<p>{_t(
"Verifying this device will mark it as trusted, and users who have verified with " +
"you will trust this device.",
)}</p>
];
return (
<div>
{profile}
{isSelf ? selfDetailText : userDetailText}
<DialogButtons <DialogButtons
primaryButton={_t('Continue')} primaryButton={_t('Continue')}
hasCancel={true} hasCancel={true}

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

@ -1491,6 +1491,8 @@
"An error has occurred.": "An error has occurred.", "An error has occurred.": "An error has occurred.",
"Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.", "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
"Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.", "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.",
"Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.",
"Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.",
"Waiting for partner to confirm...": "Waiting for partner to confirm...", "Waiting for partner to confirm...": "Waiting for partner to confirm...",
"Incoming Verification Request": "Incoming Verification Request", "Incoming Verification Request": "Incoming Verification Request",
"Integrations are disabled": "Integrations are disabled", "Integrations are disabled": "Integrations are disabled",