mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-28 12:45:45 +01:00
[PM-6769] [SM-1158] Fix Translation pipe issues on main (#8319)
* Require init in i18n service. this is needed to load translations and set translation locale * No longer need to cast i18n * Expose user preferred locale in i18nService This is for correctly displaying `default` when no locale has been set in preferences components. The `locale$` observable should always resolve to the currently locale currently being translated to.
This commit is contained in:
parent
e6fe0d1d13
commit
25f89e2a1c
@ -26,6 +26,7 @@ export class InitService {
|
|||||||
init() {
|
init() {
|
||||||
return async () => {
|
return async () => {
|
||||||
await this.stateService.init();
|
await this.stateService.init();
|
||||||
|
await this.i18nService.init();
|
||||||
|
|
||||||
if (!BrowserPopupUtils.inPopup(window)) {
|
if (!BrowserPopupUtils.inPopup(window)) {
|
||||||
window.document.body.classList.add("body-full");
|
window.document.body.classList.add("body-full");
|
||||||
|
@ -264,7 +264,7 @@ export class SettingsComponent implements OnInit {
|
|||||||
enableDuckDuckGoBrowserIntegration:
|
enableDuckDuckGoBrowserIntegration:
|
||||||
await this.stateService.getEnableDuckDuckGoBrowserIntegration(),
|
await this.stateService.getEnableDuckDuckGoBrowserIntegration(),
|
||||||
theme: await firstValueFrom(this.themeStateService.selectedTheme$),
|
theme: await firstValueFrom(this.themeStateService.selectedTheme$),
|
||||||
locale: await firstValueFrom(this.i18nService.locale$),
|
locale: await firstValueFrom(this.i18nService.userSetLocale$),
|
||||||
};
|
};
|
||||||
this.form.setValue(initialValues, { emitEvent: false });
|
this.form.setValue(initialValues, { emitEvent: false });
|
||||||
|
|
||||||
|
@ -19,8 +19,6 @@ import { ContainerService } from "@bitwarden/common/platform/services/container.
|
|||||||
import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
|
import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
|
||||||
import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service";
|
import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service";
|
||||||
|
|
||||||
import { I18nService } from "../core/i18n.service";
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class InitService {
|
export class InitService {
|
||||||
constructor(
|
constructor(
|
||||||
@ -52,7 +50,7 @@ export class InitService {
|
|||||||
|
|
||||||
setTimeout(() => this.notificationsService.init(), 3000);
|
setTimeout(() => this.notificationsService.init(), 3000);
|
||||||
await this.vaultTimeoutService.init(true);
|
await this.vaultTimeoutService.init(true);
|
||||||
await (this.i18nService as I18nService).init();
|
await this.i18nService.init();
|
||||||
(this.eventUploadService as EventUploadService).init(true);
|
(this.eventUploadService as EventUploadService).init(true);
|
||||||
this.twoFactorService.init();
|
this.twoFactorService.init();
|
||||||
const htmlEl = this.win.document.documentElement;
|
const htmlEl = this.win.document.documentElement;
|
||||||
|
@ -8,6 +8,7 @@ import eng from "../../../locales/en/messages.json";
|
|||||||
|
|
||||||
class PreloadedEnglishI18nService extends TranslationService implements I18nService {
|
class PreloadedEnglishI18nService extends TranslationService implements I18nService {
|
||||||
translationLocale = "en";
|
translationLocale = "en";
|
||||||
|
userSetLocale$: Observable<string | undefined> = of("en");
|
||||||
locale$: Observable<string> = of("en");
|
locale$: Observable<string> = of("en");
|
||||||
constructor() {
|
constructor() {
|
||||||
super("en", "", () => {
|
super("en", "", () => {
|
||||||
|
@ -141,7 +141,7 @@ export class PreferencesComponent implements OnInit {
|
|||||||
),
|
),
|
||||||
enableFavicons: !(await this.settingsService.getDisableFavicon()),
|
enableFavicons: !(await this.settingsService.getDisableFavicon()),
|
||||||
theme: await firstValueFrom(this.themeStateService.selectedTheme$),
|
theme: await firstValueFrom(this.themeStateService.selectedTheme$),
|
||||||
locale: (await firstValueFrom(this.i18nService.locale$)) ?? null,
|
locale: (await firstValueFrom(this.i18nService.userSetLocale$)) ?? null,
|
||||||
};
|
};
|
||||||
this.startingLocale = initialFormValues.locale;
|
this.startingLocale = initialFormValues.locale;
|
||||||
this.form.setValue(initialFormValues, { emitEvent: false });
|
this.form.setValue(initialFormValues, { emitEvent: false });
|
||||||
|
@ -3,6 +3,8 @@ import { Observable } from "rxjs";
|
|||||||
import { TranslationService } from "./translation.service";
|
import { TranslationService } from "./translation.service";
|
||||||
|
|
||||||
export abstract class I18nService extends TranslationService {
|
export abstract class I18nService extends TranslationService {
|
||||||
|
userSetLocale$: Observable<string | undefined>;
|
||||||
locale$: Observable<string>;
|
locale$: Observable<string>;
|
||||||
abstract setLocale(locale: string): Promise<void>;
|
abstract setLocale(locale: string): Promise<void>;
|
||||||
|
abstract init(): Promise<void>;
|
||||||
}
|
}
|
||||||
|
@ -12,6 +12,7 @@ const LOCALE_KEY = new KeyDefinition<string>(TRANSLATION_DISK, "locale", {
|
|||||||
export class I18nService extends TranslationService implements I18nServiceAbstraction {
|
export class I18nService extends TranslationService implements I18nServiceAbstraction {
|
||||||
translationLocale: string;
|
translationLocale: string;
|
||||||
protected translationLocaleState: GlobalState<string>;
|
protected translationLocaleState: GlobalState<string>;
|
||||||
|
userSetLocale$: Observable<string | undefined>;
|
||||||
locale$: Observable<string>;
|
locale$: Observable<string>;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@ -22,7 +23,8 @@ export class I18nService extends TranslationService implements I18nServiceAbstra
|
|||||||
) {
|
) {
|
||||||
super(systemLanguage, localesDirectory, getLocalesJson);
|
super(systemLanguage, localesDirectory, getLocalesJson);
|
||||||
this.translationLocaleState = globalStateProvider.get(LOCALE_KEY);
|
this.translationLocaleState = globalStateProvider.get(LOCALE_KEY);
|
||||||
this.locale$ = this.translationLocaleState.state$.pipe(map((locale) => locale ?? null));
|
this.userSetLocale$ = this.translationLocaleState.state$;
|
||||||
|
this.locale$ = this.userSetLocale$.pipe(map((locale) => locale ?? this.translationLocale));
|
||||||
}
|
}
|
||||||
|
|
||||||
async setLocale(locale: string): Promise<void> {
|
async setLocale(locale: string): Promise<void> {
|
||||||
|
@ -3,6 +3,7 @@ import { Observable } from "rxjs";
|
|||||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||||
|
|
||||||
export class I18nMockService implements I18nService {
|
export class I18nMockService implements I18nService {
|
||||||
|
userSetLocale$: Observable<string | undefined>;
|
||||||
locale$: Observable<string>;
|
locale$: Observable<string>;
|
||||||
supportedTranslationLocales: string[];
|
supportedTranslationLocales: string[];
|
||||||
translationLocale: string;
|
translationLocale: string;
|
||||||
@ -38,4 +39,8 @@ export class I18nMockService implements I18nService {
|
|||||||
async setLocale(locale: string): Promise<void> {
|
async setLocale(locale: string): Promise<void> {
|
||||||
throw new Error("Method not implemented.");
|
throw new Error("Method not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
init(): Promise<void> {
|
||||||
|
throw new Error("Method not implemented.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user