Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/browser/src/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,29 @@
"upgradeToUseArchive": {
"message": "A premium membership is required to use Archive."
},
"archiveItemsPlural": {
"message": "Archive $NUM$ items",
"description": "Title of the archive items dialog when multiple items are selected",
"placeholders": {
"num": {
"content": "$1",
"example": "5"
}
}
},
"archiveItemsSingular": {
"message": "Archive $NUM$ item",
"description": "Title of the archive items dialog when a single item is selected",
"placeholders": {
"num": {
"content": "$1",
"example": "1"
}
}
},
"archiveItemsPluralDescription": {
"message": "Once archived, these items will be excluded from search results and autofill suggestions."
},
"itemRestored": {
"message": "Item has been restored"
},
Expand Down
183 changes: 171 additions & 12 deletions apps/desktop/src/locales/en/messages.json

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can use the opportunity to align to the new dialog designs. I already started with this for the web e1868e7

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added e7fd8c2. You have BulkDeleteService in the apps/web, could it be moved to libs/vault so that I could reuse that as well?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that makes sense

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved here 4964f6a

Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,21 @@
"attachments": {
"message": "Attachments"
},
"attachmentsNeedFix": {
"message": "This item has old file attachments that need to be fixed."
},
"viewItem": {
"message": "View item"
},
"viewCollectionWithName": {
"message": "View collection - $NAME$",
"placeholders": {
"name": {
"content": "$1",
"example": "Collection1"
}
}
},
"viewItemHeaderLogin": {
"message": "View Login",
"description": "Header for view login item type"
Expand Down Expand Up @@ -341,6 +353,15 @@
"editItem": {
"message": "Edit item"
},
"editItemWithName": {
"message": "Edit item - $NAME$",
"placeholders": {
"name": {
"content": "$1",
"example": "Google Login"
}
}
},
"emailAddress": {
"message": "Email address"
},
Expand Down Expand Up @@ -809,6 +830,45 @@
"deleteItem": {
"message": "Delete item"
},
"deleteItemsCount": {
"message": "Delete $COUNT$ items",
"placeholders": {
"count": {
"content": "$1",
"example": "3"
}
}
},
"deleteItemDesc": {
"message": "This item will be sent to your trash. After 30 days there, it will be permanently deleted."
},
"deleteItemsDesc": {
"message": "These items will be sent to your trash. After 30 days there, they will be permanently deleted."
},
"deleteItemPermanently": {
"message": "Delete item permanently"
},
"deleteItemsPermanentlyCount": {
"message": "Delete $COUNT$ items permanently",
"placeholders": {
"count": {
"content": "$1",
"example": "3"
}
}
},
"deleteItemPermanentlyDesc": {
"message": "You will not be able to recover this item."
},
"deleteItemsPermanentlyDesc": {
"message": "You will not be able to recover these items."
},
"deleteSelection": {
"message": "Delete selection"
},
"deleteItemsAndCollectionsDesc": {
"message": "The selected items and collections will be permanently deleted."
},
"deleteFolder": {
"message": "Delete folder"
},
Expand Down Expand Up @@ -1812,15 +1872,6 @@
"message": "Copy security code",
"description": "Copy credit card security code (CVV)"
},
"copyPrivateKey": {
"message": "Copy private key"
},
"copyPublicKey": {
"message": "Copy public key"
},
"copyFingerprint": {
"message": "Copy fingerprint"
},
Comment on lines -1815 to -1823

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were duplicate keys in the file

"cardNumber": {
"message": "card number"
},
Expand Down Expand Up @@ -2420,12 +2471,36 @@
"archivedItemRestored": {
"message": "Archived item restored"
},
"archivedItemsRestored": {
"message": "Archived items restored"
},
"restoredItem": {
"message": "Item restored"
},
"restoredItems": {
"message": "Items restored"
},
"permanentlyDelete": {
"message": "Permanently delete"
},
"permanentlyDeletedItems": {
"message": "Items permanently deleted"
},
"deletedItems": {
"message": "Items sent to trash"
},
"deletedCollections": {
"message": "Deleted collections"
},
"collectionDeleted": {
"message": "Collection deleted"
},
"collectionsDeleted": {
"message": "Collections deleted"
},
"movedItems": {
"message": "Items moved"
},
"vaultTimeoutLogOutConfirmation": {
"message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?"
},
Expand Down Expand Up @@ -4650,9 +4725,6 @@
}
}
},
"personalItemTransferWarningSingular": {
"message": "1 item will be permanently transferred to the selected organization. You will no longer own this item."
},
"personalItemWithOrgTransferWarningSingular": {
"message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.",
"placeholders": {
Expand All @@ -4662,6 +4734,31 @@
}
}
},
"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"
}
}
},
"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"
},
"org": {
"content": "$2",
"example": "Organization name"
}
}
},
"successfullyAssignedCollections": {
"message": "Successfully assigned collections"
},
Expand Down Expand Up @@ -4814,6 +4911,47 @@
"unArchiveAndSave": {
"message": "Unarchive and save"
},
"archiveItemsPlural": {
"message": "Archive $NUM$ items",
"description": "Title of the archive items dialog when multiple items are selected",
"placeholders": {
"num": {
"content": "$1",
"example": "5"
}
}
},
"archiveItemsSingular": {
"message": "Archive $NUM$ item",
"description": "Title of the archive items dialog when a single item is selected",
"placeholders": {
"num": {
"content": "$1",
"example": "1"
}
}
},
"archiveItemsPluralDescription": {
"message": "Once archived, these items will be excluded from search results and autofill suggestions."
},
"bulkArchiveItems": {
"message": "Items archived"
},
"bulkUnarchiveItems": {
"message": "Items unarchived"
},
"moveSelectedItemsDesc": {
"message": "Choose a folder that you would like to add the $COUNT$ selected item(s) to.",
"placeholders": {
"count": {
"content": "$1",
"example": "150"
}
}
},
"selectFolder": {
"message": "Select folder"
},
"restartPremium": {
"message": "Restart Premium"
},
Expand Down Expand Up @@ -5366,5 +5504,26 @@
},
"cannotSaveItemNoConfirmedOrgs": {
"message": "Unable to save item. You must be confirmed to the organization to save items."
},
"addToFolder": {
"message": "Add to folder"
},
"deleteCollection": {
"message": "Delete collection"
},
"deleteCollectionsCount": {
"message": "Delete $COUNT$ collections",
"placeholders": {
"count": {
"content": "$1",
"example": "3"
}
}
},
"deleteCollectionDesc": {
"message": "This collection will be permanently deleted."
},
"deleteCollectionsDesc": {
"message": "These collections will be permanently deleted."
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Injectable, inject } from "@angular/core";
import { lastValueFrom } from "rxjs";

import { DialogService } from "@bitwarden/components";
import {
AssignCollectionsDialogRef,
AssignCollectionsParams,
AssignCollectionsResult,
CollectionAssignmentParams,
CollectionAssignmentResult,
} from "@bitwarden/vault";

import { AssignCollectionsDesktopComponent } from "../../vault/assign-collections";

@Injectable()
export class AssignCollectionsDesktopDialogAdapter implements AssignCollectionsDialogRef {
private readonly dialogService = inject(DialogService);

async open(params: AssignCollectionsParams): Promise<AssignCollectionsResult> {
const dialog = AssignCollectionsDesktopComponent.open(this.dialogService, {
data: params as CollectionAssignmentParams,
});
const result = await lastValueFrom(dialog.closed);
return result === CollectionAssignmentResult.Saved
? AssignCollectionsResult.Saved
: AssignCollectionsResult.Canceled;
}
}
Loading
Loading