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

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
pull/21833/head
J. Ryan Stinnett 2019-04-12 17:40:22 +01:00
parent 9a59b0d390
commit bded275f6a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/settings/KeyBackupPanel.js
View File

@ -187,10 +187,16 @@ export default class KeyBackupPanel extends React.PureComponent {
clientBackupStatus = <div>
<p>{encryptedMessageAreEncrypted}</p>
<p>{_t(
"This device is <b>not backing up your keys</b>.", {},
"This device is <b>not backing up your keys</b>, " +
"but there is an existing backup you can restore from " +
"and add to going forward.", {},
{b: sub => <b>{sub}</b>},
)}</p>
<p>{_t("Back up your keys before signing out to avoid losing them.")}</p>
<p>{_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.",
)}</p>
</div>;
}

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

@ -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 <b>not backing up your keys</b>.": "This device is <b>not backing up your keys</b>.",
"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 <b>not backing up your keys</b>, but there is an existing backup you can restore from and add to going forward.": "This device is <b>not backing up your keys</b>, 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 <verify>unknown</verify> device with ID %(deviceId)s.": "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.",
@ -484,6 +484,7 @@
"Backup version: ": "Backup version: ",
"Algorithm: ": "Algorithm: ",
"Your keys are <b>not being backed up from this device</b>.": "Your keys are <b>not being backed up from this device</b>.",
"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.",