Merge branch 'main' into km/userkey-rotation-v2

apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html

@@ -70,11 +70,11 @@
             </ng-container>
             <ng-container *ngIf="!dialogReadonly">
               <bit-callout
-                title="{{ 'grantAddAccessCollectionWarningTitle' | i18n }}"
+                title="{{ 'grantManageCollectionWarningTitle' | i18n }}"
                 type="warning"
                 *ngIf="showAddAccessWarning"
               >
-                {{ "grantAddAccessCollectionWarning" | i18n }}
+                {{ "grantManageCollectionWarning" | i18n }}
               </bit-callout>
               <span *ngIf="organization.useGroups">{{ "grantCollectionAccess" | i18n }}</span>
               <span *ngIf="!organization.useGroups">{{

apps/web/src/locales/en/messages.json

@@ -8792,11 +8792,11 @@
   "readOnlyCollectionAccess": {
     "message": "You do not have access to manage this collection."
   },
-  "grantAddAccessCollectionWarningTitle": {
-    "message": "Missing Can Manage Permissions"
+  "grantManageCollectionWarningTitle": {
+    "message": "Missing Manage Collection Permissions"
   },
-  "grantAddAccessCollectionWarning": {
-    "message": "Grant Can manage permissions to allow full collection management including deletion of collection."
+  "grantManageCollectionWarning": {
+    "message": "Grant Manage collection permissions to allow full collection management including deletion of collection."
   },
   "grantCollectionAccess": {
     "message": "Grant groups or members access to this collection."

libs/vault/src/cipher-form/cipher-form.stories.ts

@@ -1,8 +1,14 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { signal } from "@angular/core";
+import { importProvidersFrom, signal } from "@angular/core";
 import { action } from "@storybook/addon-actions";
-import { componentWrapperDecorator, Meta, moduleMetadata, StoryObj } from "@storybook/angular";
+import {
+  applicationConfig,
+  componentWrapperDecorator,
+  Meta,
+  moduleMetadata,
+  StoryObj,
+} from "@storybook/angular";
 import { BehaviorSubject } from "rxjs";
 
 import { CollectionView } from "@bitwarden/admin-console/common";
@@ -16,7 +22,6 @@ import { DomainSettingsService } from "@bitwarden/common/autofill/services/domai
 import { ClientType } from "@bitwarden/common/enums";
 import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
@@ -29,6 +34,10 @@ import {
   CipherFormGenerationService,
   PasswordRepromptService,
 } from "@bitwarden/vault";
+// FIXME: remove `/apps` import from `/libs`
+// FIXME: remove `src` and fix import
+// eslint-disable-next-line import/no-restricted-paths, no-restricted-imports
+import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/src/app/core/tests";
 
 import { CipherFormService } from "./abstractions/cipher-form.service";
 import { TotpCaptureService } from "./abstractions/totp-capture.service";
@@ -207,12 +216,14 @@ export default {
             getFeatureFlag: () => Promise.resolve(false),
           },
         },
-        { provide: I18nService, useValue: { t: (...keys: string[]) => keys.join(" ") } },
       ],
     }),
     componentWrapperDecorator(
       (story) => `<div class="tw-bg-background-alt tw-text-main tw-border">${story}</div>`,
     ),
+    applicationConfig({
+      providers: [importProvidersFrom(PreloadedEnglishI18nModule)],
+    }),
   ],
   args: {
     config: defaultConfig,