From 82f416c292f7958bfd7d41fcf8beba00289c20a2 Mon Sep 17 00:00:00 2001 From: Brandon Treston Date: Fri, 31 Jan 2025 11:39:53 -0500 Subject: [PATCH] [PM-16579] update copy (#13138) * update copy * update copy refference --- .../access-selector/access-selector.models.ts | 10 +++---- .../vault-items/vault-cipher-row.component.ts | 12 ++++---- .../vault-collection-row.component.ts | 2 +- apps/web/src/locales/en/messages.json | 28 +++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts index b281b8619fe..8702c0f7a6c 100644 --- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts @@ -83,11 +83,11 @@ export type Permission = { export const getPermissionList = (): Permission[] => { const permissions = [ - { perm: CollectionPermission.View, labelId: "canView" }, - { perm: CollectionPermission.ViewExceptPass, labelId: "canViewExceptPass" }, - { perm: CollectionPermission.Edit, labelId: "canEdit" }, - { perm: CollectionPermission.EditExceptPass, labelId: "canEditExceptPass" }, - { perm: CollectionPermission.Manage, labelId: "canManage" }, + { perm: CollectionPermission.View, labelId: "viewItems" }, + { perm: CollectionPermission.ViewExceptPass, labelId: "viewItemsHidePass" }, + { perm: CollectionPermission.Edit, labelId: "editItems" }, + { perm: CollectionPermission.EditExceptPass, labelId: "editItemsHidePass" }, + { perm: CollectionPermission.Manage, labelId: "manageCollection" }, ]; return permissions; diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts index 556d3d54594..19dad4e9da0 100644 --- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts +++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts @@ -52,11 +52,11 @@ export class VaultCipherRowComponent implements OnInit { protected CipherType = CipherType; private permissionList = getPermissionList(); private permissionPriority = [ - "canManage", - "canEdit", - "canEditExceptPass", - "canView", - "canViewExceptPass", + "manageCollection", + "editItems", + "editItemsHidePass", + "viewItems", + "viewItemsHidePass", ]; protected organization?: Organization; @@ -118,7 +118,7 @@ export class VaultCipherRowComponent implements OnInit { protected get permissionText() { if (!this.cipher.organizationId || this.cipher.collectionIds.length === 0) { - return this.i18nService.t("canManage"); + return this.i18nService.t("manageCollection"); } const filteredCollections = this.collections.filter((collection) => { diff --git a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts index 404e26fc210..d07ba46d136 100644 --- a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts +++ b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts @@ -74,7 +74,7 @@ export class VaultCollectionRowComponent { get permissionText() { if (this.collection.id == Unassigned && this.organization?.canEditUnassignedCiphers) { - return this.i18nService.t("canEdit"); + return this.i18nService.t("editItems"); } if ((this.collection as CollectionAdminView).assigned) { const permissionList = getPermissionList(); diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index f2b2361a9b6..2a84623b8e9 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -2191,8 +2191,20 @@ "manage": { "message": "Manage" }, - "canManage": { - "message": "Can manage" + "manageCollection": { + "message": "Manage collection" + }, + "viewItems": { + "message": "View items" + }, + "viewItemsHidePass": { + "message": "View items, hidden passwords" + }, + "editItems": { + "message": "Edit items" + }, + "editItemsHidePass": { + "message": "Edit items, hidden passwords" }, "disable": { "message": "Turn off" @@ -7687,18 +7699,6 @@ "noCollection": { "message": "No collection" }, - "canView": { - "message": "Can view" - }, - "canViewExceptPass": { - "message": "Can view, except passwords" - }, - "canEdit": { - "message": "Can edit" - }, - "canEditExceptPass": { - "message": "Can edit, except passwords" - }, "noCollectionsAdded": { "message": "No collections added" },