Merge pull request #6493 from matrix-org/t3chguy/cp/6492
[Release] Fix CreateRoomDialog exploding when making public room outside of a space
This commit is contained in:
commit
11e75ee852
2 changed files with 8 additions and 1 deletions
|
@ -250,7 +250,7 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
|
||||||
|
|
||||||
{ _t("You can change this at any time from room settings.") }
|
{ _t("You can change this at any time from room settings.") }
|
||||||
</p>;
|
</p>;
|
||||||
} else if (this.state.joinRule === JoinRule.Public) {
|
} else if (this.state.joinRule === JoinRule.Public && this.props.parentSpace) {
|
||||||
publicPrivateLabel = <p>
|
publicPrivateLabel = <p>
|
||||||
{ _t(
|
{ _t(
|
||||||
"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/>.", {}, {
|
||||||
|
@ -260,6 +260,12 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
|
||||||
|
|
||||||
{ _t("You can change this at any time from room settings.") }
|
{ _t("You can change this at any time from room settings.") }
|
||||||
</p>;
|
</p>;
|
||||||
|
} else if (this.state.joinRule === JoinRule.Public) {
|
||||||
|
publicPrivateLabel = <p>
|
||||||
|
{ _t("Anyone will be able to find and join this room.") }
|
||||||
|
|
||||||
|
{ _t("You can change this at any time from room settings.") }
|
||||||
|
</p>;
|
||||||
} else if (this.state.joinRule === JoinRule.Invite) {
|
} else if (this.state.joinRule === JoinRule.Invite) {
|
||||||
publicPrivateLabel = <p>
|
publicPrivateLabel = <p>
|
||||||
{ _t(
|
{ _t(
|
||||||
|
|
|
@ -2195,6 +2195,7 @@
|
||||||
"Everyone in <SpaceName/> will be able to find and join this room.": "Everyone in <SpaceName/> will be able to find and join this room.",
|
"Everyone in <SpaceName/> will be able to find and join this room.": "Everyone in <SpaceName/> will be able to find and join this room.",
|
||||||
"You can change this at any time from room settings.": "You can change this at any time from room settings.",
|
"You can change this at any time from room settings.": "You can change this at any time from room settings.",
|
||||||
"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, 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.",
|
"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. Bridges & most bots won’t work yet.": "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.": "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.",
|
"Your server requires encryption to be enabled in private rooms.": "Your server requires encryption to be enabled in private rooms.",
|
||||||
|
|
Loading…
Reference in a new issue