imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace kick terminology with Remove from chat (#7469)

Browse source
This commit is contained in:
Michael Telatynski 2022-01-14 13:08:34 +00:00 • committed by GitHub
parent 54357c2d63
commit f4a6219c88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/elements/MemberEventListSummary.tsx
View file

@ -295,8 +295,8 @@ export default class MemberEventListSummary extends React.Component<IProps> {
break;
case "kicked":
res = (userCount > 1)
? _t("were kicked %(count)s times", { count: repeats })
: _t("was kicked %(count)s times", { count: repeats });
? _t("were removed %(count)s times", { count: repeats })
: _t("was removed %(count)s times", { count: repeats });
break;
case "changed_name":
res = (userCount > 1)

12
src/components/views/right_panel/UserInfo.tsx
View file

@ -567,10 +567,10 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
room.isSpaceRoom() ? ConfirmSpaceUserActionDialog : ConfirmUserActionDialog,
{
member,
action: member.membership === "invite" ? _t("Disinvite") : _t("Kick"),
action: member.membership === "invite" ? _t("Disinvite") : _t("Remove from chat"),
title: member.membership === "invite"
? _t("Disinvite from %(roomName)s", { roomName: room.name })
: _t("Kick from %(roomName)s", { roomName: room.name }),
: _t("Remove from %(roomName)s", { roomName: room.name }),
askReason: member.membership === "join",
danger: true,
// space-specific props
@ -583,8 +583,8 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
myMember.powerLevel > theirMember.powerLevel &&
child.currentState.hasSufficientPowerLevelFor("kick", myMember.powerLevel);
},
allLabel: _t("Kick them from everything I'm able to"),
specificLabel: _t("Kick them from specific things I'm able to"),
allLabel: _t("Remove them from everything I'm able to"),
specificLabel: _t("Remove them from specific things I'm able to"),
warningMessage: _t("They'll still be able to access whatever you're not an admin of."),
},
room.isSpaceRoom() ? "mx_ConfirmSpaceUserActionDialog_wrapper" : undefined,
@ -602,7 +602,7 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
}, function(err) {
logger.error("Kick error: " + err);
Modal.createTrackedDialog('Failed to kick', '', ErrorDialog, {
title: _t("Failed to kick"),
title: _t("Failed to remove user"),
description: ((err && err.message) ? err.message : "Operation failed"),
});
}).finally(() => {
@ -610,7 +610,7 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
});
};
const kickLabel = member.membership === "invite" ? _t("Disinvite") : _t("Kick");
const kickLabel = member.membership === "invite" ? _t("Disinvite") : _t("Remove from room");
return <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={onKick}>
{ kickLabel }
</AccessibleButton>;

2
src/components/views/rooms/RoomPreviewBar.tsx
View file

@ -359,7 +359,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
}
case MessageCase.Kicked: {
const { memberName, reason } = this.getKickOrBanInfo();
title = _t("You were kicked from %(roomName)s by %(memberName)s",
title = _t("You were removed from %(roomName)s by %(memberName)s",
{ memberName, roomName: this.roomName() });
subTitle = reason ? _t("Reason: %(reason)s", { reason }) : null;

2
src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
View file

@ -265,7 +265,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
defaultValue: 50,
},
"kick": {
desc: _t('Kick users'),
desc: _t('Remove users'),
defaultValue: 50,
},
"ban": {