From 9a59b0d390a5bbcd995e12791dcbf7a11c4a05aa Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 12 Apr 2019 12:38:35 +0100 Subject: [PATCH 1/3] Clarify that use backup means restore "Use key backup" feels like it's telling me I haven't set it up at all. This changes to "Restore ..." which seems more reassuring. Fixes https://github.com/vector-im/riot-web/issues/9438 --- src/components/views/settings/KeyBackupPanel.js | 3 +-- src/i18n/strings/en_EN.json | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index 42ebf1c89d..5575f08be5 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -176,7 +176,7 @@ export default class KeyBackupPanel extends React.PureComponent { } else if (this.state.backupInfo) { const EmojiText = sdk.getComponent('elements.EmojiText'); let clientBackupStatus; - let restoreButtonCaption = _t("Restore from Backup"); + const restoreButtonCaption = _t("Restore from Backup"); if (MatrixClientPeg.get().getKeyBackupEnabled()) { clientBackupStatus =
@@ -192,7 +192,6 @@ export default class KeyBackupPanel extends React.PureComponent { )}

{_t("Back up your keys before signing out to avoid losing them.")}

; - restoreButtonCaption = _t("Use key backup"); } let uploadStatus; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index e4d1d3ea80..78733dae7c 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -469,7 +469,6 @@ "This device is backing up your keys. ": "This device is backing up your keys. ", "This device is not backing up your keys.": "This device is not backing up your keys.", "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.", - "Use key backup": "Use key backup", "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...", "All keys backed up": "All keys backed up", "Backup has a signature from unknown device with ID %(deviceId)s.": "Backup has a signature from unknown device with ID %(deviceId)s.", From bded275f6a2ed62251bc4093ff5032cf6fa4842f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 12 Apr 2019 17:40:22 +0100 Subject: [PATCH 2/3] Clarify messaging when key backup exists but is unused This makes the key backup panel much more explicit about the case where an existing backup does exist, but this device just isn't using it. You can join the device to the backup and restore from it by going through the restore workflow. Fixes https://github.com/vector-im/riot-web/issues/9446 --- src/components/views/settings/KeyBackupPanel.js | 10 ++++++++-- src/i18n/strings/en_EN.json | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index 5575f08be5..e85491bf60 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -187,10 +187,16 @@ export default class KeyBackupPanel extends React.PureComponent { clientBackupStatus =

{encryptedMessageAreEncrypted}

{_t( - "This device is not backing up your keys.", {}, + "This device is not backing up your keys, " + + "but there is an existing backup you can restore from " + + "and add to going forward.", {}, {b: sub => {sub}}, )}

-

{_t("Back up your keys before signing out to avoid losing them.")}

+

{_t( + "Enable key backup on this device via the restore " + + "process before signing out to avoid losing any keys " + + "that may only be on this device.", + )}

; } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 78733dae7c..5d390f815a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -467,8 +467,8 @@ "Unable to load key backup status": "Unable to load key backup status", "Restore from Backup": "Restore from Backup", "This device is backing up your keys. ": "This device is backing up your keys. ", - "This device is not backing up your keys.": "This device is not backing up your keys.", - "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.", + "This device is not backing up your keys, but there is an existing backup you can restore from and add to going forward.": "This device is not backing up your keys, but there is an existing backup you can restore from and add to going forward.", + "Enable key backup on this device via the restore process before signing out to avoid losing any keys that may only be on this device.": "Enable key backup on this device via the restore process before signing out to avoid losing any keys that may only be on this device.", "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...", "All keys backed up": "All keys backed up", "Backup has a signature from unknown device with ID %(deviceId)s.": "Backup has a signature from unknown device with ID %(deviceId)s.", @@ -484,6 +484,7 @@ "Backup version: ": "Backup version: ", "Algorithm: ": "Algorithm: ", "Your keys are not being backed up from this device.": "Your keys are not being backed up from this device.", + "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.", "Start using Key Backup": "Start using Key Backup", "Error saving email notification preferences": "Error saving email notification preferences", "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.", From 2054d5378274000572d7a932e844d70f1ead15ec Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 15 Apr 2019 15:10:19 +0100 Subject: [PATCH 3/3] Tweaked wording after discussing with @lampholder --- src/components/views/settings/KeyBackupPanel.js | 10 +++++----- src/i18n/strings/en_EN.json | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js index e85491bf60..2ba05a0e6b 100644 --- a/src/components/views/settings/KeyBackupPanel.js +++ b/src/components/views/settings/KeyBackupPanel.js @@ -176,7 +176,7 @@ export default class KeyBackupPanel extends React.PureComponent { } else if (this.state.backupInfo) { const EmojiText = sdk.getComponent('elements.EmojiText'); let clientBackupStatus; - const restoreButtonCaption = _t("Restore from Backup"); + let restoreButtonCaption = _t("Restore from Backup"); if (MatrixClientPeg.get().getKeyBackupEnabled()) { clientBackupStatus =
@@ -188,16 +188,16 @@ export default class KeyBackupPanel extends React.PureComponent {

{encryptedMessageAreEncrypted}

{_t( "This device is not backing up your keys, " + - "but there is an existing backup you can restore from " + + "but you do have an existing backup you can restore from " + "and add to going forward.", {}, {b: sub => {sub}}, )}

{_t( - "Enable key backup on this device via the restore " + - "process before signing out to avoid losing any keys " + - "that may only be on this device.", + "Connect this device to key backup before signing out to avoid " + + "losing any keys that may only be on this device.", )}

; + restoreButtonCaption = _t("Connect this device to Key Backup"); } let uploadStatus; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 5d390f815a..d0f265e430 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -467,8 +467,9 @@ "Unable to load key backup status": "Unable to load key backup status", "Restore from Backup": "Restore from Backup", "This device is backing up your keys. ": "This device is backing up your keys. ", - "This device is not backing up your keys, but there is an existing backup you can restore from and add to going forward.": "This device is not backing up your keys, but there is an existing backup you can restore from and add to going forward.", - "Enable key backup on this device via the restore process before signing out to avoid losing any keys that may only be on this device.": "Enable key backup on this device via the restore process before signing out to avoid losing any keys that may only be on this device.", + "This device is not backing up your keys, but you do have an existing backup you can restore from and add to going forward.": "This device is not backing up your keys, but you do have an existing backup you can restore from and add to going forward.", + "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.", + "Connect this device to Key Backup": "Connect this device to Key Backup", "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...", "All keys backed up": "All keys backed up", "Backup has a signature from unknown device with ID %(deviceId)s.": "Backup has a signature from unknown device with ID %(deviceId)s.",