From bded275f6a2ed62251bc4093ff5032cf6fa4842f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 12 Apr 2019 17:40:22 +0100 Subject: [PATCH] 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.",