Skip to content

Fix: Change wording on e2e to make a little more clear #12124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2018
Merged

Fix: Change wording on e2e to make a little more clear #12124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions packages/rocketchat-e2e/client/rocketchat.e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class E2E {
} catch (error) {
this.started = false;
alerts.open({
title: TAPi18n.__('Wasn\'t possible to decode you encryption key to be imported.'),
title: TAPi18n.__('Wasn\'t possible to decode your encryption key to be imported.'),
html: '<div>Your encryption password seems wrong. Click here to try again.</div>',
modifiers: ['large', 'danger'],
closable: true,
Expand Down Expand Up @@ -142,7 +142,7 @@ class E2E {
if (randomPassword) {
alerts.open({
title: TAPi18n.__('Save your encryption password'),
html: `<div><span style="font-weight: bold;">${ randomPassword }</span><br/>This password will show up only this time. Click here to know more about it.</div>`,
html: `<div><span style="font-weight: bold;">${ randomPassword }</span><br/>This password will only show up this time. Click here to learn more.</div>`,
modifiers: ['large'],
closable: false,
icon: 'key',
Expand All @@ -152,15 +152,18 @@ class E2E {
html: true,
text: `
<div>
Now you can create encrypted private groups or change your direct messages to be encrypted. This is a end to end encryption so the key to encode/decode your messages will not be saved in our savers, for that reason you need to save this password to be able to transfer your key from this client to your mobile phone or to another browser.
You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted.
<br/>
This is end to end encryption so the key to encode/decode your messages will not be saved on the server.
For that reason you need to store this password somewhere safe. You will be required to enter it on other devices you wish to use e2e encryption on.
<br/>
<br/>
Your password is: <span style="font-weight: bold;">${ randomPassword }</span>
<br/>
<br/>
This is a auto generated password and you can setup a new password for your encryption key any time from any browser that already did receive your key.
This is an auto generated password, you can setup a new password for your encryption key any time from any browser you have entered the existing password.
<br/>
This password is stored on this browser only while you don't copy it and click to dismiss this message.
This password is only stored on this browser until you store the password and dismiss this message.
</div>
`,
showConfirmButton: true,
Expand Down