From f19730b8997882033f6bb3ecd8d00394f34466ce Mon Sep 17 00:00:00 2001 From: Harsh <116981900+reharsh@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:27:11 +0530 Subject: [PATCH] settings: Update activate/deactivate/manage users and bot tooltips. Tooltip changes: In organization settings - "Edit user" -> "Manage user" - "Edit bot" -> "Manage bot" - "Deactivate" -> "Deactivate user" - "Reactivate" -> "Reactivate user" In profile modal - "Manage user" -> "Manage bot" (for bots) fixes part of #32887. --- web/src/tippyjs.ts | 4 ++-- web/templates/settings/settings_user_list_row.hbs | 2 +- web/templates/user_profile_modal.hbs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/tippyjs.ts b/web/src/tippyjs.ts index 89cab4968a..80f1613a85 100644 --- a/web/src/tippyjs.ts +++ b/web/src/tippyjs.ts @@ -607,10 +607,10 @@ export function initialize(): void { trigger: "mouseenter", onShow(instance) { if ($(instance.reference).hasClass("deactivate")) { - instance.setContent($t({defaultMessage: "Deactivate"})); + instance.setContent($t({defaultMessage: "Deactivate user"})); return undefined; } else if ($(instance.reference).hasClass("reactivate")) { - instance.setContent($t({defaultMessage: "Reactivate"})); + instance.setContent($t({defaultMessage: "Reactivate user"})); return undefined; } return false; diff --git a/web/templates/settings/settings_user_list_row.hbs b/web/templates/settings/settings_user_list_row.hbs index 583b0059e0..cd267b5d75 100644 --- a/web/templates/settings/settings_user_list_row.hbs +++ b/web/templates/settings/settings_user_list_row.hbs @@ -36,7 +36,7 @@ - diff --git a/web/templates/user_profile_modal.hbs b/web/templates/user_profile_modal.hbs index f41c21fd00..250fc90584 100644 --- a/web/templates/user_profile_modal.hbs +++ b/web/templates/user_profile_modal.hbs @@ -28,7 +28,7 @@ {{/if}} {{#if can_manage_profile}}
- +
{{/if}}