From 9c03cffe30cf48e48605a6b025b864b0f711eb5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:58:26 +0000
Subject: [PATCH] [PM-15156] Copy update on Organization member Delete modals
 (#12182)

* Rename 'Remove users' to 'Remove members' in bulk remove dialog

* Update warning messages for bulk delete dialog and single member deletion
---
 .../bulk/bulk-delete-dialog.component.html    |  2 +-
 .../bulk/bulk-remove-dialog.component.html    |  4 ++--
 .../member-dialog/member-dialog.component.ts  |  5 ++++-
 .../members/members.component.ts              |  5 ++++-
 apps/web/src/locales/en/messages.json         | 19 ++++++++++++++++---
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
index 9a4ce89671e..bb5294ebf02 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
@@ -8,7 +8,7 @@
     </bit-callout>
     <ng-container *ngIf="!done">
       <bit-callout type="warning" *ngIf="users.length > 0 && !error">
-        <p bitTypography="body1">{{ "deleteOrganizationUserWarning" | i18n }}</p>
+        <p bitTypography="body1">{{ "deleteManyOrganizationUsersWarningDesc" | i18n }}</p>
       </bit-callout>
       <bit-table>
         <ng-container header>
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html
index 8b921d69814..8727148f4ff 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html
@@ -1,4 +1,4 @@
-<bit-dialog dialogSize="large" [title]="'removeUsers' | i18n">
+<bit-dialog dialogSize="large" [title]="'removeMembers' | i18n">
   <ng-container bitDialogContent>
     <bit-callout type="danger" *ngIf="users.length <= 0">
       {{ "noSelectedUsersApplicable" | i18n }}
@@ -79,7 +79,7 @@
       [disabled]="loading"
       [bitAction]="submit"
     >
-      {{ "removeUsers" | i18n }}
+      {{ "removeMembers" | i18n }}
     </button>
     <button bitButton type="button" buttonType="secondary" bitDialogClose>
       {{ "close" | i18n }}
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
index 04df2957f91..fe84c5097de 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
@@ -579,7 +579,10 @@ export class MemberDialogComponent implements OnDestroy {
         key: "deleteOrganizationUser",
         placeholders: [this.params.name],
       },
-      content: { key: "deleteOrganizationUserWarning" },
+      content: {
+        key: "deleteOrganizationUserWarningDesc",
+        placeholders: [this.params.name],
+      },
       type: "warning",
       acceptButtonText: { key: "delete" },
       cancelButtonText: { key: "cancel" },
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index 371314d1ca8..b33807c66c9 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -742,7 +742,10 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
         key: "deleteOrganizationUser",
         placeholders: [this.userNamePipe.transform(user)],
       },
-      content: { key: "deleteOrganizationUserWarning" },
+      content: {
+        key: "deleteOrganizationUserWarningDesc",
+        placeholders: [this.userNamePipe.transform(user)],
+      },
       type: "warning",
       acceptButtonText: { key: "delete" },
       cancelButtonText: { key: "cancel" },
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index eb98a1d7577..660a00c364d 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -9715,9 +9715,19 @@
       "description": "Title for the delete organization user dialog"
     }
   },
-  "deleteOrganizationUserWarning": {
-    "message": "When a member is deleted, their Bitwarden account and individual vault data will be permanently deleted. Collection data will remain in the organization. To reinstate them they must create an account and be onboarded again.",
-    "description": "Warning for the delete organization user dialog"
+  "deleteOrganizationUserWarningDesc": {
+    "message": "This will permanently delete all items owned by $NAME$. Collection items are not impacted.",
+    "description": "Warning description for the delete organization user dialog",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Doe"
+      }
+    }
+  },
+  "deleteManyOrganizationUsersWarningDesc": {
+    "message": "This will permanently delete all items owned by the following members. Collection items are not impacted.",
+    "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
     "message": "Deleted $NAME$",
@@ -9787,5 +9797,8 @@
   },
   "descriptorCode": {
     "message": "Descriptor code"
+  },
+  "removeMembers": {
+    "message": "Remove members"
   }
 }