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

Merge pull request #4535 from matrix-org/dbkr/a_toast_to_you_sir 

Add device name to unverified session toast
pull/21833/head
David Baker 2020-04-30 16:37:04 +01:00 committed by GitHub
parent 3acb952d9a 3240b3bd60
commit c7e663832a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/toasts/UnverifiedSessionToast.js
View File

@ -49,9 +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">
{_t("Verify the new login accessing your account & messages")} {_t(
"Verify the new login accessing your account: %(name)s", { name: device.getDisplayName()})}
</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} />

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

@ -568,7 +568,7 @@
"Set up": "Set up", "Set up": "Set up",
"Upgrade": "Upgrade", "Upgrade": "Upgrade",
"Verify": "Verify", "Verify": "Verify",
"Verify the new login accessing your account & messages": "Verify the new login accessing your account & messages", "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
"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:",