From 886f8d31fb523a9b42db07fcaae03a7795c071c6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Sep 2021 16:23:42 +0100
Subject: [PATCH] Iterate title on confirm space action dialog

---
 src/components/views/right_panel/UserInfo.tsx | 34 +++++++++++++++++--
 src/i18n/strings/en_EN.json                   | 10 ++++--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 091581a6f8..605b47f027 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -541,6 +541,21 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
     if (member.membership !== "invite" && member.membership !== "join") return null;
 
     const onKick = async () => {
+        let title: string;
+        if (room.isSpaceRoom()) {
+            if (member.membership === "invite") {
+                title = _t("Disinvite this user from %(spaceName)s?", { spaceName: room.name });
+            } else {
+                title = _t("Kick this user from %(spaceName)s?", { spaceName: room.name });
+            }
+        } else {
+            if (member.membership === "invite") {
+                title = _t("Disinvite this user?");
+            } else {
+                title = _t("Kick this user?");
+            }
+        }
+
         const { finished } = Modal.createTrackedDialog(
             'Confirm User Action Dialog',
             'onKick',
@@ -548,7 +563,7 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
             {
                 member,
                 action: member.membership === "invite" ? _t("Disinvite") : _t("Kick"),
-                title: member.membership === "invite" ? _t("Disinvite this user?") : _t("Kick this user?"),
+                title,
                 askReason: member.membership === "join",
                 danger: true,
                 // space-specific props
@@ -681,6 +696,21 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa
 
     const isBanned = member.membership === "ban";
     const onBanOrUnban = async () => {
+        let title: string;
+        if (room.isSpaceRoom()) {
+            if (isBanned) {
+                title = _t("Unban this user from %(spaceName)s?", { spaceName: room.name });
+            } else {
+                title = _t("Ban this user from %(spaceName)s?", { spaceName: room.name });
+            }
+        } else {
+            if (isBanned) {
+                title = _t("Unban this user?");
+            } else {
+                title = _t("Ban this user?");
+            }
+        }
+
         const { finished } = Modal.createTrackedDialog(
             'Confirm User Action Dialog',
             'onBanOrUnban',
@@ -688,7 +718,7 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa
             {
                 member,
                 action: isBanned ? _t("Unban") : _t("Ban"),
-                title: isBanned ? _t("Unban this user?") : _t("Ban this user?"),
+                title,
                 askReason: !isBanned,
                 danger: !isBanned,
                 // space-specific props
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 83f1e1988d..e986139eb8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1845,10 +1845,12 @@
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
     "Demote": "Demote",
-    "Disinvite": "Disinvite",
-    "Kick": "Kick",
+    "Disinvite this user from %(spaceName)s?": "Disinvite this user from %(spaceName)s?",
+    "Kick this user from %(spaceName)s?": "Kick this user from %(spaceName)s?",
     "Disinvite this user?": "Disinvite this user?",
     "Kick this user?": "Kick this user?",
+    "Disinvite": "Disinvite",
+    "Kick": "Kick",
     "Kick them from everything I'm able to": "Kick them from everything I'm able to",
     "Kick them from specific things I'm able to": "Kick them from specific things I'm able to",
     "If you're not an admin of a room or space in <SpaceName/>, they'll still be able to access it after you kick them.": "If you're not an admin of a room or space in <SpaceName/>, they'll still be able to access it after you kick them.",
@@ -1862,9 +1864,11 @@
     "Remove %(count)s messages|other": "Remove %(count)s messages",
     "Remove %(count)s messages|one": "Remove 1 message",
     "Remove recent messages": "Remove recent messages",
-    "Ban": "Ban",
+    "Unban this user from %(spaceName)s?": "Unban this user from %(spaceName)s?",
+    "Ban this user from %(spaceName)s?": "Ban this user from %(spaceName)s?",
     "Unban this user?": "Unban this user?",
     "Ban this user?": "Ban this user?",
+    "Ban": "Ban",
     "Unban them from everything I'm able to": "Unban them from everything I'm able to",
     "Ban them from everything I'm able to": "Ban them from everything I'm able to",
     "Unban them from specific things I'm able to": "Unban them from specific things I'm able to",