mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-11 10:10:25 +01:00
[PM-9951] Assign to Collection copy (#10205)
* refactor "Assign collections" to "Assign to collections" * show singular or plural version of collection assignment success message * update singular and plural warning text * refactor switch to be an `if`
This commit is contained in:
Nick Krantz
GitHub
parent
26a3f6b8ec
commit
3093566f01
@ -3500,8 +3500,8 @@
|
||||
"noValuesToCopy": {
|
||||
"message": "No values to copy"
|
||||
},
|
||||
"assignCollections": {
|
||||
"message": "Assign collections"
|
||||
"assignToCollections": {
|
||||
"message": "Assign to collections"
|
||||
},
|
||||
"copyEmail": {
|
||||
"message": "Copy email"
|
||||
@ -3797,21 +3797,33 @@
|
||||
"selectCollectionsToAssign": {
|
||||
"message": "Select collections to assign"
|
||||
},
|
||||
"personalItemsTransferWarning": {
|
||||
"message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
|
||||
"personalItemTransferWarningSingular": {
|
||||
"message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
|
||||
},
|
||||
"personalItemsTransferWarningPlural": {
|
||||
"message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
|
||||
"placeholders": {
|
||||
"personal_items_count": {
|
||||
"content": "$1",
|
||||
"example": "2 items"
|
||||
"example": "2"
|
||||
}
|
||||
}
|
||||
},
|
||||
"personalItemsWithOrgTransferWarning": {
|
||||
"message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
|
||||
"personalItemWithOrgTransferWarningSingular": {
|
||||
"message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
|
||||
"placeholders": {
|
||||
"org": {
|
||||
"content": "$1",
|
||||
"example": "Organization name"
|
||||
}
|
||||
}
|
||||
},
|
||||
"personalItemsWithOrgTransferWarningPlural": {
|
||||
"message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
|
||||
"placeholders": {
|
||||
"personal_items_count": {
|
||||
"content": "$1",
|
||||
"example": "2 items"
|
||||
"example": "2"
|
||||
},
|
||||
"org": {
|
||||
"content": "$2",
|
||||
@ -3834,6 +3846,24 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"itemsMovedToOrg": {
|
||||
"message": "Items moved to $ORGNAME$",
|
||||
"placeholders": {
|
||||
"orgname": {
|
||||
"content": "$1",
|
||||
"example": "Company Name"
|
||||
}
|
||||
}
|
||||
},
|
||||
"itemMovedToOrg": {
|
||||
"message": "Item moved to $ORGNAME$",
|
||||
"placeholders": {
|
||||
"orgname": {
|
||||
"content": "$1",
|
||||
"example": "Company Name"
|
||||
}
|
||||
}
|
||||
},
|
||||
"reorderFieldDown":{
|
||||
"message": "$LABEL$ moved down, position $INDEX$ of $LENGTH$",
|
||||
"placeholders": {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<popup-page>
|
||||
<popup-header slot="header" [pageTitle]="'assignCollections' | i18n" showBackButton>
|
||||
<popup-header slot="header" [pageTitle]="'assignToCollections' | i18n" showBackButton>
|
||||
<ng-container slot="end">
|
||||
<app-pop-out></app-pop-out>
|
||||
</ng-container>
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
type="button"
|
||||
bitMenuItem
|
||||
>
|
||||
{{ "assignCollections" | i18n }}
|
||||
{{ "assignToCollections" | i18n }}
|
||||
</a>
|
||||
</ng-container>
|
||||
</bit-menu>
|
||||
|
||||
@ -570,6 +570,24 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"itemsMovedToOrg": {
|
||||
"message": "Items moved to $ORGNAME$",
|
||||
"placeholders": {
|
||||
"orgname": {
|
||||
"content": "$1",
|
||||
"example": "Company Name"
|
||||
}
|
||||
}
|
||||
},
|
||||
"itemMovedToOrg": {
|
||||
"message": "Item moved to $ORGNAME$",
|
||||
"placeholders": {
|
||||
"orgname": {
|
||||
"content": "$1",
|
||||
"example": "Company Name"
|
||||
}
|
||||
}
|
||||
},
|
||||
"deleteItem": {
|
||||
"message": "Delete item"
|
||||
},
|
||||
@ -8570,21 +8588,33 @@
|
||||
"selectFolder": {
|
||||
"message": "Select folder"
|
||||
},
|
||||
"personalItemsTransferWarning": {
|
||||
"message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to the selected organization. You will no longer own these items.",
|
||||
"personalItemTransferWarningSingular": {
|
||||
"message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
|
||||
},
|
||||
"personalItemsTransferWarningPlural": {
|
||||
"message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.",
|
||||
"placeholders": {
|
||||
"personal_items_count": {
|
||||
"content": "$1",
|
||||
"example": "2 items"
|
||||
"example": "2"
|
||||
}
|
||||
}
|
||||
},
|
||||
"personalItemsWithOrgTransferWarning": {
|
||||
"message": "$PERSONAL_ITEMS_COUNT$ will be permanently transferred to $ORG$. You will no longer own these items.",
|
||||
"personalItemWithOrgTransferWarningSingular": {
|
||||
"message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
|
||||
"placeholders": {
|
||||
"org": {
|
||||
"content": "$1",
|
||||
"example": "Organization name"
|
||||
}
|
||||
}
|
||||
},
|
||||
"personalItemsWithOrgTransferWarningPlural": {
|
||||
"message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.",
|
||||
"placeholders": {
|
||||
"personal_items_count": {
|
||||
"content": "$1",
|
||||
"example": "2 items"
|
||||
"example": "2"
|
||||
},
|
||||
"org": {
|
||||
"content": "$2",
|
||||
|
||||
@ -13,7 +13,6 @@ import {
|
||||
} from "rxjs";
|
||||
|
||||
import { JslibModule } from "@bitwarden/angular/jslib.module";
|
||||
import { PluralizePipe } from "@bitwarden/angular/pipes/pluralize.pipe";
|
||||
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
|
||||
import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
|
||||
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
||||
@ -134,10 +133,18 @@ export class AssignCollectionsComponent implements OnInit {
|
||||
);
|
||||
|
||||
protected transferWarningText = (orgName: string, itemsCount: number) => {
|
||||
const pluralizedItems = this.pluralizePipe.transform(itemsCount, "item", "items");
|
||||
return orgName
|
||||
? this.i18nService.t("personalItemsWithOrgTransferWarning", pluralizedItems, orgName)
|
||||
: this.i18nService.t("personalItemsTransferWarning", pluralizedItems);
|
||||
const haveOrgName = !!orgName;
|
||||
|
||||
if (itemsCount > 1 && haveOrgName) {
|
||||
return this.i18nService.t("personalItemsWithOrgTransferWarningPlural", itemsCount, orgName);
|
||||
}
|
||||
if (itemsCount > 1 && !haveOrgName) {
|
||||
return this.i18nService.t("personalItemsTransferWarningPlural", itemsCount);
|
||||
}
|
||||
if (itemsCount === 1 && haveOrgName) {
|
||||
return this.i18nService.t("personalItemWithOrgTransferWarningSingular", orgName);
|
||||
}
|
||||
return this.i18nService.t("personalItemTransferWarningSingular");
|
||||
};
|
||||
|
||||
private editableItems: CipherView[] = [];
|
||||
@ -155,7 +162,6 @@ export class AssignCollectionsComponent implements OnInit {
|
||||
private organizationService: OrganizationService,
|
||||
private collectionService: CollectionService,
|
||||
private formBuilder: FormBuilder,
|
||||
private pluralizePipe: PluralizePipe,
|
||||
private toastService: ToastService,
|
||||
) {}
|
||||
|
||||
@ -416,7 +422,7 @@ export class AssignCollectionsComponent implements OnInit {
|
||||
variant: "success",
|
||||
title: null,
|
||||
message: this.i18nService.t(
|
||||
"movedItemsToOrg",
|
||||
shareableCiphers.length === 1 ? "itemMovedToOrg" : "itemsMovedToOrg",
|
||||
this.orgName ?? this.i18nService.t("organization"),
|
||||
),
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user