From 8eaae6bdbc290f7329b68ab73c067a49ea82652e Mon Sep 17 00:00:00 2001
From: Emmanuel <63562663+EECvision@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:01:32 +0100
Subject: [PATCH] Change "Ban" to "Ban from room" to fix an inconsistency in
 the Admin Tools dialog (#8281)

* fix-admin-tools-phrase-inconsistency

* correctly specify space room action

* run i18n

* Apply suggestions from code review

Revert the applied formatting.

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/UserInfo.tsx | 16 +++++++++++-----
 src/i18n/strings/en_EN.json                   |  5 ++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index a96a6c2961..934f88b0a7 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -178,7 +178,7 @@ function useHasCrossSigningKeys(cli: MatrixClient, member: User, canVerify: bool
     }, [cli, member, canVerify], undefined);
 }
 
-function DeviceItem({ userId, device }: {userId: string, device: IDevice}) {
+function DeviceItem({ userId, device }: { userId: string, device: IDevice }) {
     const cli = useContext(MatrixClientContext);
     const isMe = userId === cli.getUserId();
     const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId);
@@ -239,7 +239,7 @@ function DeviceItem({ userId, device }: {userId: string, device: IDevice}) {
     }
 }
 
-function DevicesSection({ devices, userId, loading }: {devices: IDevice[], userId: string, loading: boolean}) {
+function DevicesSection({ devices, userId, loading }: { devices: IDevice[], userId: string, loading: boolean }) {
     const cli = useContext(MatrixClientContext);
     const userTrust = cli.checkUserTrust(userId);
 
@@ -653,7 +653,9 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa
             room.isSpaceRoom() ? ConfirmSpaceUserActionDialog : ConfirmUserActionDialog,
             {
                 member,
-                action: isBanned ? _t("Unban") : _t("Ban"),
+                action: room.isSpaceRoom()
+                    ? (isBanned ? _t("Unban from space") : _t("Ban from space"))
+                    : (isBanned ? _t("Unban from room") : _t("Ban from room")),
                 title: isBanned
                     ? _t("Unban from %(roomName)s", { roomName: room.name })
                     : _t("Ban from %(roomName)s", { roomName: room.name }),
@@ -719,9 +721,13 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa
         });
     };
 
-    let label = _t("Ban");
+    let label = room.isSpaceRoom()
+        ? _t("Ban from space")
+        : _t("Ban from room");
     if (isBanned) {
-        label = _t("Unban");
+        label = room.isSpaceRoom()
+            ? _t("Unban from space")
+            : _t("Unban from room");
     }
 
     const classes = classNames("mx_UserInfo_field", {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3195ed38b1..081a280687 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1992,7 +1992,10 @@
     "Failed to remove user": "Failed to remove user",
     "Remove from room": "Remove from room",
     "Remove recent messages": "Remove recent messages",
-    "Ban": "Ban",
+    "Unban from space": "Unban from space",
+    "Ban from space": "Ban from space",
+    "Unban from room": "Unban from room",
+    "Ban from room": "Ban from room",
     "Unban from %(roomName)s": "Unban from %(roomName)s",
     "Ban from %(roomName)s": "Ban from %(roomName)s",
     "Unban them from everything I'm able to": "Unban them from everything I'm able to",