From 6a7ef29285b1c1ef71aeab8a01b4a2280df777f3 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Tue, 5 Jul 2022 12:59:27 -0400 Subject: [PATCH 1/2] Adjust encryption copy when creating a video room --- src/components/views/dialogs/CreateRoomDialog.tsx | 12 +++++++----- src/i18n/strings/en_EN.json | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx index 7d1028bba79..3a636987a71 100644 --- a/src/components/views/dialogs/CreateRoomDialog.tsx +++ b/src/components/views/dialogs/CreateRoomDialog.tsx @@ -222,7 +222,7 @@ export default class CreateRoomDialog extends React.Component { render() { const isVideoRoom = this.props.type === RoomType.ElementVideo; - let aliasField; + let aliasField: JSX.Element; if (this.state.joinRule === JoinRule.Public) { const domain = MatrixClientPeg.get().getDomain(); aliasField = ( @@ -274,12 +274,14 @@ export default class CreateRoomDialog extends React.Component {

; } - let e2eeSection; + let e2eeSection: JSX.Element; if (this.state.joinRule !== JoinRule.Public) { - let microcopy; + let microcopy: string; if (privateShouldBeEncrypted()) { if (this.state.canChangeEncryption) { - microcopy = _t("You can't disable this later. Bridges & most bots won't work yet."); + microcopy = isVideoRoom + ? _t("You can't disable this later. The room will be encrypted but the embedded call is not.") + : _t("You can't disable this later. Bridges & most bots won't work yet."); } else { microcopy = _t("Your server requires encryption to be enabled in private rooms."); } @@ -312,7 +314,7 @@ export default class CreateRoomDialog extends React.Component { ); } - let title; + let title: string; if (isVideoRoom) { title = _t("Create a video room"); } else if (this.props.parentSpace) { diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 906d2358d1b..ad666e3f2e9 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2445,6 +2445,7 @@ "Anyone will be able to find and join this room, not just members of .": "Anyone will be able to find and join this room, not just members of .", "Anyone will be able to find and join this room.": "Anyone will be able to find and join this room.", "Only people invited will be able to find and join this room.": "Only people invited will be able to find and join this room.", + "You can't disable this later. The room will be encrypted but the embedded call is not.": "You can't disable this later. The room will be encrypted but the embedded call is not.", "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 requires encryption to be enabled in private rooms.": "Your server requires encryption to be enabled in private rooms.", "Enable end-to-end encryption": "Enable end-to-end encryption", From 7b8c2d9427a7f5e027fa79dad0a01cde564f5c82 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Tue, 5 Jul 2022 14:03:40 -0400 Subject: [PATCH 2/2] Adjust wording --- src/components/views/dialogs/CreateRoomDialog.tsx | 2 +- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx index 3a636987a71..8425a7269cc 100644 --- a/src/components/views/dialogs/CreateRoomDialog.tsx +++ b/src/components/views/dialogs/CreateRoomDialog.tsx @@ -280,7 +280,7 @@ export default class CreateRoomDialog extends React.Component { if (privateShouldBeEncrypted()) { if (this.state.canChangeEncryption) { microcopy = isVideoRoom - ? _t("You can't disable this later. The room will be encrypted but the embedded call is not.") + ? _t("You can't disable this later. The room will be encrypted but the embedded call will not.") : _t("You can't disable this later. Bridges & most bots won't work yet."); } else { microcopy = _t("Your server requires encryption to be enabled in private rooms."); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index ad666e3f2e9..444c871a2b6 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2445,7 +2445,7 @@ "Anyone will be able to find and join this room, not just members of .": "Anyone will be able to find and join this room, not just members of .", "Anyone will be able to find and join this room.": "Anyone will be able to find and join this room.", "Only people invited will be able to find and join this room.": "Only people invited will be able to find and join this room.", - "You can't disable this later. The room will be encrypted but the embedded call is not.": "You can't disable this later. The room will be encrypted but the embedded call is not.", + "You can't disable this later. The room will be encrypted but the embedded call will not.": "You can't disable this later. The room will be encrypted but the embedded call will not.", "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 requires encryption to be enabled in private rooms.": "Your server requires encryption to be enabled in private rooms.", "Enable end-to-end encryption": "Enable end-to-end encryption",