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

Merge pull request #2506 from matrix-org/dbkr/room_recovery_reminder_verifydevice 

New text/caption for key backup by verifying device
pull/21833/head
David Baker 2019-01-25 17:13:09 +00:00 committed by GitHub
parent 41bc2a3d0c f6bbfd7e0d
commit 1b5be8603c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/views/rooms/RoomRecoveryReminder.js
View File

@ -133,17 +133,29 @@ export default class RoomRecoveryReminder extends React.PureComponent {
const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton"); const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton");
let body; let body;
let primaryCaption;
if (this.state.error) { if (this.state.error) {
body = <div className="error"> body = <div className="error">
{_t("Unable to load key backup status")} {_t("Unable to load key backup status")}
</div>; </div>;
primaryCaption = _t("Set up");
} else if (this.state.unverifiedDevice) { } else if (this.state.unverifiedDevice) {
// A key backup exists for this account, but the creating device is not // A key backup exists for this account, but the creating device is not
// verified. // verified.
body = _t( body = <div>
"To view your secure message history and ensure you can view new " + <p>{_t(
"messages on future devices, set up Secure Message Recovery.", "Secure Message Recovery has been set up on another device: <deviceName></deviceName>",
); {},
{
deviceName: () => <i>{this.state.unverifiedDevice.unsigned.device_display_name}</i>,
},
)}</p>
<p>{_t(
"To view your secure message history and ensure you can view new " +
"messages on future devices, verify that device now.",
)}</p>
</div>;
primaryCaption = _t("Verify device");
} else { } else {
// The default case assumes that a key backup doesn't exist for this account. // The default case assumes that a key backup doesn't exist for this account.
// (This component doesn't currently check that itself.) // (This component doesn't currently check that itself.)
@ -167,7 +179,7 @@ export default class RoomRecoveryReminder extends React.PureComponent {
</AccessibleButton> </AccessibleButton>
<AccessibleButton className="mx_RoomRecoveryReminder_button" <AccessibleButton className="mx_RoomRecoveryReminder_button"
onClick={this.onSetupClick}> onClick={this.onSetupClick}>
{ _t("Set up") } {primaryCaption}
</AccessibleButton> </AccessibleButton>
</div> </div>
</div> </div>

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

@ -667,7 +667,8 @@
"You are trying to access a room.": "You are trying to access a room.", "You are trying to access a room.": "You are trying to access a room.",
"<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!", "<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!",
"This is a preview of this room. Room interactions have been disabled": "This is a preview of this room. Room interactions have been disabled", "This is a preview of this room. Room interactions have been disabled": "This is a preview of this room. Room interactions have been disabled",
"To view your secure message history and ensure you can view new messages on future devices, set up Secure Message Recovery.": "To view your secure message history and ensure you can view new messages on future devices, set up Secure Message Recovery.", "Secure Message Recovery has been set up on another device: <deviceName></deviceName>": "Secure Message Recovery has been set up on another device: <deviceName></deviceName>",
"To view your secure message history and ensure you can view new messages on future devices, verify that device now.": "To view your secure message history and ensure you can view new messages on future devices, verify that device now.",
"If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.": "If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.", "If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.": "If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.",
"Secure Message Recovery": "Secure Message Recovery", "Secure Message Recovery": "Secure Message Recovery",
"Don't ask again": "Don't ask again", "Don't ask again": "Don't ask again",