Revert "[EC-772] Add i18n key typechecking in web (#4023)" (#4296)

This reverts commit 5a1940f3f4.

apps/web/src/app/core/core.module.ts

@@ -12,7 +12,7 @@ import {
 import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
 import { ModalService as ModalServiceAbstraction } from "@bitwarden/angular/services/modal.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/abstractions/login.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service";
@@ -27,6 +27,7 @@ import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.s
 import { BroadcasterMessagingService } from "./broadcaster-messaging.service";
 import { EventService } from "./event.service";
 import { HtmlStorageService } from "./html-storage.service";
+import { I18nService } from "./i18n.service";
 import { InitService } from "./init.service";
 import { ModalService } from "./modal.service";
 import { PasswordRepromptService } from "./password-reprompt.service";
@@ -35,7 +36,6 @@ import { RouterService } from "./router.service";
 import { Account, GlobalState, StateService } from "./state";
 import { StateMigrationService } from "./state-migration.service";
 import { WebFileDownloadService } from "./web-file-download.service";
-import { WebI18nServiceImplementation } from "./web-i18n.service.implementation";
 import { WebPlatformUtilsService } from "./web-platform-utils.service";
 
 @NgModule({
@@ -46,7 +46,6 @@ import { WebPlatformUtilsService } from "./web-platform-utils.service";
     RouterService,
     EventService,
     PolicyListService,
-    WebI18nServiceImplementation,
     {
       provide: APP_INITIALIZER,
       useFactory: (initService: InitService) => initService.init(),
@@ -62,8 +61,8 @@ import { WebPlatformUtilsService } from "./web-platform-utils.service";
       useValue: false,
     },
     {
-      provide: I18nService,
-      useClass: WebI18nServiceImplementation,
+      provide: I18nServiceAbstraction,
+      useClass: I18nService,
       deps: [SYSTEM_LANGUAGE, LOCALES_DIRECTORY],
     },
     { provide: AbstractStorageService, useClass: HtmlStorageService },

apps/web/src/app/core/i18n.service.ts

@@ -1,13 +1,6 @@
-import { Injectable } from "@angular/core";
+import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
 
-import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
-
-import type eng from "../../locales/en/messages.json";
-
-export type WebI18nKey = keyof typeof eng;
-
-@Injectable()
-export class WebI18nServiceImplementation extends I18nServiceImplementation<WebI18nKey> {
+export class I18nService extends BaseI18nService {
   constructor(systemLanguage: string, localesDirectory: string) {
     super(systemLanguage || "en-US", localesDirectory, async (formattedLocale: string) => {
       const filePath =

apps/web/src/app/core/init.service.ts

@@ -9,7 +9,7 @@ import {
   Urls,
 } from "@bitwarden/common/abstractions/environment.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
 import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service";
 import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service";
@@ -18,7 +18,7 @@ import { ContainerService } from "@bitwarden/common/services/container.service";
 import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
 import { VaultTimeoutService as VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
 
-import { WebI18nServiceImplementation } from "./web-i18n.service.implementation";
+import { I18nService } from "./i18n.service";
 
 @Injectable()
 export class InitService {
@@ -27,7 +27,7 @@ export class InitService {
     private environmentService: EnvironmentServiceAbstraction,
     private notificationsService: NotificationsServiceAbstraction,
     private vaultTimeoutService: VaultTimeoutServiceAbstraction,
-    private i18nService: I18nService,
+    private i18nService: I18nServiceAbstraction,
     private eventUploadService: EventUploadServiceAbstraction,
     private twoFactorService: TwoFactorServiceAbstraction,
     private stateService: StateServiceAbstraction,
@@ -47,7 +47,7 @@ export class InitService {
       setTimeout(() => this.notificationsService.init(), 3000);
       (this.vaultTimeoutService as VaultTimeoutService).init(true);
       const locale = await this.stateService.getLocale();
-      await (this.i18nService as WebI18nServiceImplementation).init(locale);
+      await (this.i18nService as I18nService).init(locale);
       (this.eventUploadService as EventUploadService).init(true);
       this.twoFactorService.init();
       const htmlEl = this.win.document.documentElement;

apps/web/src/app/core/web-i18n.pipe.ts

@@ -1,10 +0,0 @@
-import { Pipe } from "@angular/core";
-
-import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe";
-
-import { WebI18nKey } from "./web-i18n.service.implementation";
-
-@Pipe({
-  name: "i18n",
-})
-export class WebI18nPipe extends I18nPipe<WebI18nKey> {}