From da6c2e0c3c13fa88d708d205300a5651a31e087a Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Tue, 2 Jul 2024 13:23:16 -0700
Subject: [PATCH] settings: Rename Deactivated users settings subtab.

Includes help center updates to better link to the tab.

Fixes https://chat.zulip.org/#narrow/stream/9-issues/topic/deactivated.20users.20tab/near/1843114
---
 help/deactivate-or-reactivate-a-user.md    | 4 +++-
 web/src/settings_panel_menu.js             | 2 +-
 zerver/lib/markdown/help_settings_links.py | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/help/deactivate-or-reactivate-a-user.md b/help/deactivate-or-reactivate-a-user.md
index 674935d898..93731afea6 100644
--- a/help/deactivate-or-reactivate-a-user.md
+++ b/help/deactivate-or-reactivate-a-user.md
@@ -82,7 +82,9 @@ bots will be deactivated until the user manually
 
 {settings_tab|deactivated}
 
-1. Click the **Reactivate** button to the right of the user account that you
+1. Select the **Deactivated** tab.
+
+1. Click the **Reactivate** button to the right of the user that you
    want to reactivate.
 
 {tab|via-user-profile}
diff --git a/web/src/settings_panel_menu.js b/web/src/settings_panel_menu.js
index 71e0fa4475..4a58878918 100644
--- a/web/src/settings_panel_menu.js
+++ b/web/src/settings_panel_menu.js
@@ -59,7 +59,7 @@ export class SettingsPanelMenu {
             values: [
                 {label: $t({defaultMessage: "Users"}), key: "active"},
                 {
-                    label: $t({defaultMessage: "Deactivated users"}),
+                    label: $t({defaultMessage: "Deactivated"}),
                     key: "deactivated",
                 },
                 {label: $t({defaultMessage: "Invitations"}), key: "invitations"},
diff --git a/zerver/lib/markdown/help_settings_links.py b/zerver/lib/markdown/help_settings_links.py
index f58ed8ea27..21bc4d17a0 100644
--- a/zerver/lib/markdown/help_settings_links.py
+++ b/zerver/lib/markdown/help_settings_links.py
@@ -65,7 +65,7 @@ link_mapping = {
     ],
     "deactivated": [
         "Organization settings",
-        "Deactivated users",
+        "Users",
         "/#organization/users/deactivated",
     ],
     "bot-list-admin": [
@@ -120,7 +120,7 @@ def getMarkdown(setting_type_name: str, setting_name: str, setting_link: str) ->
         relative_link = f"[{setting_name}]({setting_link})"
         # The "Bots" label appears in both Personal and Organization settings
         # in the user interface so we need special text for this setting.
-        if setting_name == "Bots":
+        if setting_name in ["Bots", "Users"]:
             return f"1. Navigate to the {relative_link} \
                     tab of the **{setting_type_name}** menu."
         return f"1. Go to {relative_link}."