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

Use new copy

Browse source 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
Aaron Raimist 2021-04-14 18:27:35 -05:00
parent 0af52c931e
commit 9c250171b4
No known key found for this signature in database
GPG key ID: 37419210002890EF
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/MatrixChat.tsx
View file

@ -1098,7 +1098,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
warnings.push(( warnings.push((
<span className="warning" key="only_member_warning"> <span className="warning" key="only_member_warning">
{' '/* Whitespace, otherwise the sentences get smashed together */ } {' '/* Whitespace, otherwise the sentences get smashed together */ }
{ _t("You are the only member of this room. This room will become unjoinable if you leave.") } { _t("You are the only person here. If you leave, no one will be able to join in the future, including you.") }
</span> </span>
)); ));
@ -1126,7 +1126,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
const roomToLeave = MatrixClientPeg.get().getRoom(roomId); const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
const warnings = this.leaveRoomWarnings(roomId); const warnings = this.leaveRoomWarnings(roomId);
const hasWarnings = warnings.length > 0;
const isSpace = roomToLeave?.isSpaceRoom(); const isSpace = roomToLeave?.isSpaceRoom();
Modal.createTrackedDialog(isSpace ? "Leave space" : "Leave room", '', QuestionDialog, { Modal.createTrackedDialog(isSpace ? "Leave space" : "Leave room", '', QuestionDialog, {
@ -1140,7 +1139,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
</span> </span>
), ),
button: _t("Leave"), button: _t("Leave"),
danger: hasWarnings,
onFinished: (shouldLeave) => { onFinished: (shouldLeave) => {
if (shouldLeave) { if (shouldLeave) {
const d = leaveRoomBehaviour(roomId); const d = leaveRoomBehaviour(roomId);

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

@ -2545,7 +2545,7 @@
"Failed to reject invitation": "Failed to reject invitation", "Failed to reject invitation": "Failed to reject invitation",
"Cannot create rooms in this community": "Cannot create rooms in this community", "Cannot create rooms in this community": "Cannot create rooms in this community",
"You do not have permission to create rooms in this community.": "You do not have permission to create rooms in this community.", "You do not have permission to create rooms in this community.": "You do not have permission to create rooms in this community.",
"You are the only member of this room. This room will become unjoinable if you leave.": "You are the only member of this room. This room will become unjoinable if you leave.", "You are the only person here. If you leave, no one will be able to join in the future, including you.": "You are the only person here. If you leave, no one will be able to join in the future, including you.",
"This space is not public. You will not be able to rejoin without an invite.": "This space is not public. You will not be able to rejoin without an invite.", "This space is not public. You will not be able to rejoin without an invite.": "This space is not public. You will not be able to rejoin without an invite.",
"This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.", "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
"Are you sure you want to leave the space '%(spaceName)s'?": "Are you sure you want to leave the space '%(spaceName)s'?", "Are you sure you want to leave the space '%(spaceName)s'?": "Are you sure you want to leave the space '%(spaceName)s'?",