bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 09:43:23 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
This reverts commit 5a1940f3f4.
This commit is contained in:
Robyn MacCallum
2022-12-21 17:46:23 -05:00
committed by GitHub
parent eeb407b8a4
commit 3a98b415b0
50 changed files with 109 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/browser/src/background/main.background.ts
View File

@@ -92,7 +92,6 @@ import { BrowserStateService as StateServiceAbstraction } from "../services/abst
import AutofillService from "../services/autofill.service";
import { BrowserEnvironmentService } from "../services/browser-environment.service";
import { BrowserFolderService } from "../services/browser-folder.service";
import BrowserI18nServiceImplementation from "../services/browser-i18n.service.implementation";
import { BrowserOrganizationService } from "../services/browser-organization.service";
import { BrowserPolicyService } from "../services/browser-policy.service";
import { BrowserSettingsService } from "../services/browser-settings.service";
@@ -102,6 +101,7 @@ import BrowserLocalStorageService from "../services/browserLocalStorage.service"
import BrowserMessagingService from "../services/browserMessaging.service";
import BrowserMessagingPrivateModeBackgroundService from "../services/browserMessagingPrivateModeBackground.service";
import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
import I18nService from "../services/i18n.service";
import { KeyGenerationService } from "../services/keyGeneration.service";
import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service";
import { VaultFilterService } from "../services/vaultFilter.service";
@@ -260,7 +260,7 @@ export default class MainBackground {
},
window
);
this.i18nService = new BrowserI18nServiceImplementation(BrowserApi.getUILanguage(window));
this.i18nService = new I18nService(BrowserApi.getUILanguage(window));
this.encryptService = flagEnabled("multithreadDecryption")
? new MultithreadEncryptServiceImplementation(
this.cryptoFunctionService,
@@ -566,7 +566,7 @@ export default class MainBackground {
await this.stateService.init();
await (this.vaultTimeoutService as VaultTimeoutService).init(true);
await (this.i18nService as BrowserI18nServiceImplementation).init();
await (this.i18nService as I18nService).init();
await (this.eventUploadService as EventUploadService).init(true);
await this.runtimeBackground.init();
await this.notificationBackground.init();

16
apps/browser/src/background/service_factories/i18n-service.factory.ts
View File

@@ -1,7 +1,7 @@
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
import { I18nService as AbstractI18nService } from "@bitwarden/common/abstractions/i18n.service";
import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
import BrowserI18nServiceImplementation from "../../services/browser-i18n.service.implementation";
import I18nService from "../../services/i18n.service";
import { FactoryOptions, CachedServices, factory } from "./factory-options";
@@ -14,17 +14,17 @@ type I18nServiceFactoryOptions = FactoryOptions & {
export type I18nServiceInitOptions = I18nServiceFactoryOptions;
export async function i18nServiceFactory(
cache: { i18nService?: I18nService } & CachedServices,
cache: { i18nService?: AbstractI18nService } & CachedServices,
opts: I18nServiceInitOptions
): Promise<I18nService> {
): Promise<AbstractI18nService> {
const service = await factory(
cache,
"i18nService",
opts,
() => new BrowserI18nServiceImplementation(opts.i18nServiceOptions.systemLanguage)
() => new I18nService(opts.i18nServiceOptions.systemLanguage)
);
if (!(service as I18nServiceImplementation as any).inited) {
await (service as I18nServiceImplementation).init();
if (!(service as BaseI18nService as any).inited) {
await (service as BaseI18nService).init();
}
return service;
}

4
apps/browser/src/services/browser-i18n.service.implementation.ts → apps/browser/src/services/i18n.service.ts
View File

@@ -1,6 +1,6 @@
import { I18nServiceImplementation } from "@bitwarden/common/services/i18n.service.implementation";
import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service";
export default class BrowserI18nServiceImplementation extends I18nServiceImplementation {
export default class I18nService extends BaseI18nService {
constructor(systemLanguage: string) {
super(systemLanguage, null, async (formattedLocale: string) => {
// Deprecated