Skip to content

[FIX] System message of e2e encryption missing #2888

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
diegolmello merged 6 commits into from
Feb 24, 2021
Merged

[FIX] System message of e2e encryption missing #2888

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ac9479
[FIX] System message of e2e encryption missing
kresnaputra Feb 9, 2021
79b8a0b
add new encryption string
kresnaputra Feb 9, 2021
3467a4d
add to stories
kresnaputra Feb 23, 2021
d3569b4
Merge branch 'develop' into fix.e2e-encryption-missing
diegolmello Feb 24, 2021
8092a83
Add pt-BR
diegolmello Feb 24, 2021
5fdfd7f
Move stories
diegolmello Feb 24, 2021
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
8 changes: 7 additions & 1 deletion app/containers/message/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ export const SYSTEM_MESSAGES = [
'room_changed_privacy',
'room_changed_avatar',
'message_snippeted',
'thread-created'
'thread-created',
'room_e2e_enabled',
'room_e2e_disabled'
];

export const SYSTEM_MESSAGE_TYPES = {
Expand Down Expand Up @@ -100,6 +102,10 @@ export const getInfoMessage = ({
return I18n.t('Room_changed_avatar', { userBy: username });
} else if (type === 'message_snippeted') {
return I18n.t('Created_snippet');
} else if (type === 'room_e2e_disabled') {
return I18n.t('Encryption_disabled', { userBy: username });
} else if (type === 'room_e2e_enabled') {
return I18n.t('Encryption_enabled', { userBy: username });
}
return '';
};
Expand Down
2 changes: 2 additions & 0 deletions app/i18n/locales/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ export default {
E2E_How_It_Works_info2: 'This is *end to end encryption* so the key to encode/decode your messages and they will not be saved on the server. For that reason *you need to store this password somewhere safe* which you can access later if you may need.',
E2E_How_It_Works_info3: 'If you proceed, it will be auto generated an E2E password.',
E2E_How_It_Works_info4: 'You can also setup a new password for your encryption key any time from any browser you have entered the existing E2E password.',
Encryption_enabled: 'This room\'s encryption has been enabled by {{userBy}}',
Encryption_disabled: 'This room\'s encryption has been disabled by {{userBy}}',
edit: 'edit',
edited: 'edited',
Edit: 'Edit',
Expand Down