Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 13:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4632 from matrix-org/t3chguy/confusing_copy

Browse Source 
Update Crypto Store Too New copy
This commit is contained in:
Michael Telatynski 2020-05-26 13:45:40 +01:00 committed by GitHub
commit 0cec16d3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MatrixClientPeg.ts
View File

@ -197,9 +197,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
// The js-sdk found a crypto DB too new for it to use // The js-sdk found a crypto DB too new for it to use
const CryptoStoreTooNewDialog = const CryptoStoreTooNewDialog =
sdk.getComponent("views.dialogs.CryptoStoreTooNewDialog"); sdk.getComponent("views.dialogs.CryptoStoreTooNewDialog");
Modal.createDialog(CryptoStoreTooNewDialog, { Modal.createDialog(CryptoStoreTooNewDialog);
host: window.location.host,
});
} }
// this can happen for a number of reasons, the most likely being // this can happen for a number of reasons, the most likely being
// that the olm library was missing. It's not fatal. // that the olm library was missing. It's not fatal.

6
src/components/views/dialogs/CryptoStoreTooNewDialog.js
View File

@ -42,11 +42,9 @@ export default (props) => {
}; };
const description = const description =
_t("You've previously used a newer version of Riot on %(host)s. " + _t("You've previously used a newer version of Riot with this session. " +
"To use this version again with end to end encryption, you will " + "To use this version again with end to end encryption, you will " +
"need to sign out and back in again. ", "need to sign out and back in again.");
{host: props.host},
);
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const DialogButtons = sdk.getComponent('views.elements.DialogButtons'); const DialogButtons = sdk.getComponent('views.elements.DialogButtons');

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

@ -1598,7 +1598,7 @@
"Create Room": "Create Room", "Create Room": "Create Room",
"Sign out": "Sign out", "Sign out": "Sign out",
"To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this", "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this",
"You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ", "You've previously used a newer version of Riot with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "You've previously used a newer version of Riot with this session. To use this version again with end to end encryption, you will need to sign out and back in again.",
"Incompatible Database": "Incompatible Database", "Incompatible Database": "Incompatible Database",
"Continue With Encryption Disabled": "Continue With Encryption Disabled", "Continue With Encryption Disabled": "Continue With Encryption Disabled",
"Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.", "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",