From ab82bf80484e69abff75ff2fcebd8f795f062852 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 5 May 2020 10:23:39 +0200
Subject: [PATCH] differentiate copy for own untrusted device dialog
---
src/i18n/strings/en_EN.json | 4 +++-
src/verification.js | 16 ++++++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5544e3a8b1..8d2aa14419 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -306,9 +306,11 @@
"%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
"Light theme": "Light theme",
"Dark theme": "Dark theme",
- "Not Trusted": "Not Trusted",
+ "You signed in to a new session without verifying it:": "You signed in to a new session without verifying it:",
+ "Verify your other session using one of the options below.": "Verify your other session using one of the options below.",
"%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
"Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
+ "Not Trusted": "Not Trusted",
"Manually Verify by Text": "Manually Verify by Text",
"Interactively verify by Emoji": "Interactively verify by Emoji",
"Done": "Done",
diff --git a/src/verification.js b/src/verification.js
index d7287552dd..f488b2ebeb 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -43,14 +43,26 @@ function UntrustedDeviceDialog(props) {
const {device, user, onFinished} = props;
const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+ let askToVerifyText;
+ let newSessionText;
+
+ if (MatrixClientPeg.get().getUserId() === user.userId) {
+ newSessionText = _t("You signed in to a new session without verifying it:");
+ askToVerifyText = _t("Verify your other session using one of the options below.");
+ } else {
+ newSessionText = _t("%(name)s (%(userId)s) signed in to a new session without verifying it:",
+ {name: user.displayName, userId: user.userId});
+ askToVerifyText = _t("Ask this user to verify their session, or manually verify it below.");
+ }
+
return <BaseDialog
onFinished={onFinished}
headerImage={require("../res/img/e2e/warning.svg")}
title={_t("Not Trusted")}>
<div className="mx_Dialog_content" id='mx_Dialog_content'>
- <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: user.displayName, userId: user.userId})}</p>
+ <p>{newSessionText}</p>
<p>{device.getDisplayName()} ({device.deviceId})</p>
- <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
+ <p>{askToVerifyText}</p>
</div>
<div className='mx_Dialog_buttons'>
<AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Manually Verify by Text")}</AccessibleButton>