Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Adjust encryption copy when creating a video room #8989

Merged
merged 2 commits into from
Jul 5, 2022
Merged

Adjust encryption copy when creating a video room #8989

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a7ef29
Adjust encryption copy when creating a video room
robintown Jul 5, 2022
7b8c2d9
Adjust wording
robintown Jul 5, 2022
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
12 changes: 7 additions & 5 deletions src/components/views/dialogs/CreateRoomDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
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 = (
Expand Down Expand Up @@ -274,12 +274,14 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
</p>;
}

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.")
robintown marked this conversation as resolved.
Show resolved Hide resolved
: _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.");
}
Expand Down Expand Up @@ -312,7 +314,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
);
}

let title;
let title: string;
if (isVideoRoom) {
title = _t("Create a video room");
} else if (this.props.parentSpace) {
Expand Down
1 change: 1 addition & 0 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,6 +2445,7 @@
"Anyone will be able to find and join this room, not just members of <SpaceName/>.": "Anyone will be able to find and join this room, not just members of <SpaceName/>.",
"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",
Expand Down