From a2fb96eb8f5d498d5af6d608a29d892ed219ccdd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Jun 2020 22:59:14 +0100
Subject: [PATCH] Update Create Room Dialog microcopy for e2ee-default:false
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/dialogs/CreateRoomDialog.js | 10 +++++++++-
src/i18n/strings/en_EN.json | 3 ++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index e318258586..42a8b10d5e 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -195,6 +195,14 @@ export default createReactClass({
let e2eeSection;
if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
+ let microcopy;
+ if (privateShouldBeEncrypted()) {
+ microcopy = _t("You can’t disable this later. Bridges & most bots won’t work yet.");
+ } else {
+ microcopy = _t("Your server admin has disabled end-to-end encryption by default " +
+ "in private rooms & Direct Messages.");
+ }
+
e2eeSection = <React.Fragment>
<LabelledToggleSwitch
label={ _t("Enable end-to-end encryption")}
@@ -202,7 +210,7 @@ export default createReactClass({
value={this.state.isEncrypted}
className='mx_CreateRoomDialog_e2eSwitch' // for end-to-end tests
/>
- <p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p>
+ <p>{ microcopy }</p>
</React.Fragment>;
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8f7e8ea6b6..176a668949 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1588,8 +1588,9 @@
"Please enter a name for the room": "Please enter a name for the room",
"Set a room address to easily share your room with other people.": "Set a room address to easily share your room with other people.",
"This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
- "Enable end-to-end encryption": "Enable end-to-end encryption",
"You can’t disable this later. Bridges & most bots won’t work yet.": "You can’t disable this later. Bridges & most bots won’t work yet.",
+ "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.",
+ "Enable end-to-end encryption": "Enable end-to-end encryption",
"Create a public room": "Create a public room",
"Create a private room": "Create a private room",
"Name": "Name",