mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 18:25:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4523 from matrix-org/dbkr/toast_copy_again_rel

Browse source 
Update (bulk) unverified device toast copy
This commit is contained in:
David Baker 2020-04-29 16:02:56 +01:00 committed by GitHub
commit de9c8b0537
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/toasts/BulkUnverifiedSessionsToast.js
View file

@ -45,7 +45,7 @@ export default class BulkUnverifiedSessionsToast extends React.PureComponent {
render() { render() {
return (<div> return (<div>
<div className="mx_Toast_description"> <div className="mx_Toast_description">
{_t("Verify your other sessions")} {_t("Unverified sessions currently have access to your account & messages")}
</div> </div>
<div className="mx_Toast_buttons" aria-live="off"> <div className="mx_Toast_buttons" aria-live="off">
<FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} /> <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />

11
src/components/views/toasts/UnverifiedSessionToast.js
View file

@ -49,20 +49,13 @@ export default class UnverifiedSessionToast extends React.PureComponent {
}; };
render() { render() {
const cli = MatrixClientPeg.get();
const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
return (<div> return (<div>
<div className="mx_Toast_description"> <div className="mx_Toast_description">
<span className="mx_Toast_deviceName"> {_t("Verify the identity of the new login accessing your account & messages")}
{device.getDisplayName()}
</span> <span className="mx_Toast_deviceID">
({device.deviceId})
</span>
</div> </div>
<div className="mx_Toast_buttons" aria-live="off"> <div className="mx_Toast_buttons" aria-live="off">
<FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} /> <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
<FormButton label={_t("Review")} onClick={this._onReviewClick} /> <FormButton label={_t("Verify")} onClick={this._onReviewClick} />
</div> </div>
</div>); </div>);
} }

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

@ -556,7 +556,7 @@
"Headphones": "Headphones", "Headphones": "Headphones",
"Folder": "Folder", "Folder": "Folder",
"Pin": "Pin", "Pin": "Pin",
"Verify your other sessions": "Verify your other sessions", "Unverified sessions currently have access to your account & messages": "Unverified sessions currently have access to your account & messages",
"Later": "Later", "Later": "Later",
"Review": "Review", "Review": "Review",
"Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe", "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
@ -565,6 +565,7 @@
"Set up": "Set up", "Set up": "Set up",
"Upgrade": "Upgrade", "Upgrade": "Upgrade",
"Verify": "Verify", "Verify": "Verify",
"Verify the identity of the new login accessing your account & messages": "Verify the identity of the new login accessing your account & messages",
"From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)", "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
"Decline (%(counter)s)": "Decline (%(counter)s)", "Decline (%(counter)s)": "Decline (%(counter)s)",
"Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:", "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",