PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4515 from matrix-org/jryans/set-up-button-text-rc

Browse source 
Fix set up encryption toast to use "set up" as action
This commit is contained in:
J. Ryan Stinnett 2020-04-29 11:09:09 +01:00 committed by GitHub
commit 698a539866
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/views/toasts/SetupEncryptionToast.js
View file

@ -90,6 +90,7 @@ export default class SetupEncryptionToast extends React.PureComponent {
getSetupCaption() { getSetupCaption() {
switch (this.props.kind) { switch (this.props.kind) {
case 'set_up_encryption': case 'set_up_encryption':
return _t('Set up');
case 'upgrade_encryption': case 'upgrade_encryption':
case 'upgrade_ssss': case 'upgrade_ssss':
return _t('Upgrade'); return _t('Upgrade');

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

@ -558,6 +558,7 @@
"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",
"Other users may not trust it": "Other users may not trust it", "Other users may not trust it": "Other users may not trust it",
"Update your secure storage": "Update your secure storage", "Update your secure storage": "Update your secure storage",
"Set up": "Set up",
"Upgrade": "Upgrade", "Upgrade": "Upgrade",
"Verify": "Verify", "Verify": "Verify",
"Later": "Later", "Later": "Later",
@ -2225,7 +2226,6 @@
"Unable to create key backup": "Unable to create key backup", "Unable to create key backup": "Unable to create key backup",
"Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.", "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",
"If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.", "If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.",
"Set up": "Set up",
"Don't ask again": "Don't ask again", "Don't ask again": "Don't ask again",
"New Recovery Method": "New Recovery Method", "New Recovery Method": "New Recovery Method",
"A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.", "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",