From 2ca6633fdaabea39e40e8880202ed78b61a4933b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Jul 2019 23:55:20 -0600
Subject: [PATCH] Update copy as per design

---
 src/components/structures/auth/SoftLogout.js | 34 +++++++++++++-------
 src/i18n/strings/en_EN.json                  |  9 +++---
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 9342c6086e..c58754e9f5 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -228,6 +228,13 @@ export default class SoftLogout extends React.Component {
             return <Spinner />;
         }
 
+        let introText = 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 on this device. " +
+                "Without them, you won’t be able to read all of your secure messages on any device.");
+        }
+
         if (this.state.loginView === LOGIN_VIEW.PASSWORD) {
             const Field = sdk.getComponent("elements.Field");
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
@@ -237,12 +244,9 @@ export default class SoftLogout extends React.Component {
                 error = <span className='mx_Login_error'>{this.state.errorText}</span>;
             }
 
-            let introText = _t("Enter your password to sign in and regain access to your account.");
-            if (this.state.keyBackupNeeded) {
-                introText = _t(
-                    "Regain access your account and recover encryption keys stored on this device. " +
-                    "Without them, you won’t be able to read all of your secure messages on any device.");
-            }
+            if (!introText) {
+                introText = _t("Enter your password to sign in and regain access to your account.");
+            } // else we already have a message and should use it (key backup warning)
 
             return (
                 <form onSubmit={this.onPasswordLogin}>
@@ -273,18 +277,26 @@ export default class SoftLogout extends React.Component {
 
         if (this.state.loginView === LOGIN_VIEW.SSO || this.state.loginView === LOGIN_VIEW.CAS) {
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+
+            if (!introText) {
+                introText = _t("Sign in and regain access to your account.");
+            } // else we already have a message and should use it (key backup warning)
+
             return (
-                <AccessibleButton kind='primary' onClick={this.onSsoLogin}>
-                    {_t('Sign in with single sign-on')}
-                </AccessibleButton>
+                <div>
+                    <p>{introText}</p>
+                    <AccessibleButton kind='primary' onClick={this.onSsoLogin}>
+                        {_t('Sign in with single sign-on')}
+                    </AccessibleButton>
+                </div>
             );
         }
 
-        // Default: assume unsupported
+        // Default: assume unsupported/error
         return (
             <p>
                 {_t(
-                    "Cannot re-authenticate with your account. Please contact your " +
+                    "You cannot sign in to your account. Please contact your " +
                     "homeserver admin for more information.",
                 )}
             </p>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c2e9d760b7..449c6ce6bc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -93,7 +93,6 @@
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
     "Unnamed Room": "Unnamed Room",
     "Error": "Error",
-    "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
     "Dismiss": "Dismiss",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
@@ -928,6 +927,7 @@
     "Saturday": "Saturday",
     "Today": "Today",
     "Yesterday": "Yesterday",
+    "View Source": "View Source",
     "Error decrypting audio": "Error decrypting audio",
     "Reply": "Reply",
     "Edit": "Edit",
@@ -1127,6 +1127,7 @@
     "Start chatting": "Start chatting",
     "Click on the button below to start chatting!": "Click on the button below to start chatting!",
     "Start Chatting": "Start Chatting",
+    "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "Removing…": "Removing…",
     "Confirm Removal": "Confirm Removal",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
@@ -1319,7 +1320,6 @@
     "Cancel Sending": "Cancel Sending",
     "Forward Message": "Forward Message",
     "Pin Message": "Pin Message",
-    "View Source": "View Source",
     "View Decrypted Source": "View Decrypted Source",
     "Unhide Preview": "Unhide Preview",
     "Share Permalink": "Share Permalink",
@@ -1589,10 +1589,11 @@
     "Create your account": "Create your account",
     "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
     "Failed to re-authenticate": "Failed to re-authenticate",
+    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.",
     "Enter your password to sign in and regain access to your account.": "Enter your password to sign in and regain access to your account.",
-    "Regain access your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Regain access your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.",
     "Forgotten your password?": "Forgotten your password?",
-    "Cannot re-authenticate with your account. Please contact your homeserver admin for more information.": "Cannot re-authenticate with your account. Please contact your homeserver admin for more information.",
+    "Sign in and regain access to your account.": "Sign in and regain access to your account.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.",
     "You're signed out": "You're signed out",
     "Your homeserver (<strong1>%(domainName)s</strong1>) admin has signed you out of your account <strong2>%(displayName)s (%(userId)s)</strong2>.": "Your homeserver (<strong1>%(domainName)s</strong1>) admin has signed you out of your account <strong2>%(displayName)s (%(userId)s)</strong2>.",
     "Clear personal data": "Clear personal data",