Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-25 12:15:18 +01:00
Code Issues Projects Releases Wiki Activity

[PM-6769] [SM-1158] Fix Translation pipe issues on main (#8319)

Browse Source 
* 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:
Matt Gibson 2024-03-13 10:35:46 -05:00 committed by GitHub
parent e6fe0d1d13
commit 25f89e2a1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/browser/src/popup/services/init.service.ts
View File

@ -26,6 +26,7 @@ export class InitService {
init() {
return async () => {
await this.stateService.init();
await this.i18nService.init();
if (!BrowserPopupUtils.inPopup(window)) {
window.document.body.classList.add("body-full");

2
apps/desktop/src/app/accounts/settings.component.ts
View File

@ -264,7 +264,7 @@ export class SettingsComponent implements OnInit {
enableDuckDuckGoBrowserIntegration:
await this.stateService.getEnableDuckDuckGoBrowserIntegration(),
theme: await firstValueFrom(this.themeStateService.selectedTheme$),
locale: await firstValueFrom(this.i18nService.locale$),
locale: await firstValueFrom(this.i18nService.userSetLocale$),
};
this.form.setValue(initialValues, { emitEvent: false });

4
apps/web/src/app/core/init.service.ts
View File

@ -19,8 +19,6 @@ import { ContainerService } from "@bitwarden/common/platform/services/container.
import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service";
import { I18nService } from "../core/i18n.service";
@Injectable()
export class InitService {
constructor(
@ -52,7 +50,7 @@ export class InitService {
setTimeout(() => this.notificationsService.init(), 3000);
await this.vaultTimeoutService.init(true);
await (this.i18nService as I18nService).init();
await this.i18nService.init();
(this.eventUploadService as EventUploadService).init(true);
this.twoFactorService.init();
const htmlEl = this.win.document.documentElement;

1
apps/web/src/app/core/tests/preloaded-english-i18n.module.ts
View File

@ -8,6 +8,7 @@ import eng from "../../../locales/en/messages.json";
class PreloadedEnglishI18nService extends TranslationService implements I18nService {
translationLocale = "en";
userSetLocale$: Observable<string | undefined> = of("en");
locale$: Observable<string> = of("en");
constructor() {
super("en", "", () => {

2
apps/web/src/app/settings/preferences.component.ts
View File

@ -141,7 +141,7 @@ export class PreferencesComponent implements OnInit {
),
enableFavicons: !(await this.settingsService.getDisableFavicon()),
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.form.setValue(initialFormValues, { emitEvent: false });

2
libs/common/src/platform/abstractions/i18n.service.ts
View File

@ -3,6 +3,8 @@ import { Observable } from "rxjs";
import { TranslationService } from "./translation.service";
export abstract class I18nService extends TranslationService {
userSetLocale$: Observable<string | undefined>;
locale$: Observable<string>;
abstract setLocale(locale: string): Promise<void>;
abstract init(): Promise<void>;
}

4
libs/common/src/platform/services/i18n.service.ts
View File

@ -12,6 +12,7 @@ const LOCALE_KEY = new KeyDefinition<string>(TRANSLATION_DISK, "locale", {
export class I18nService extends TranslationService implements I18nServiceAbstraction {
translationLocale: string;
protected translationLocaleState: GlobalState<string>;
userSetLocale$: Observable<string | undefined>;
locale$: Observable<string>;
constructor(
@ -22,7 +23,8 @@ export class I18nService extends TranslationService implements I18nServiceAbstra
) {
super(systemLanguage, localesDirectory, getLocalesJson);
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> {

5
libs/components/src/utils/i18n-mock.service.ts
View File

@ -3,6 +3,7 @@ import { Observable } from "rxjs";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
export class I18nMockService implements I18nService {
userSetLocale$: Observable<string | undefined>;
locale$: Observable<string>;
supportedTranslationLocales: string[];
translationLocale: string;
@ -38,4 +39,8 @@ export class I18nMockService implements I18nService {
async setLocale(locale: string): Promise<void> {
throw new Error("Method not implemented.");
}
init(): Promise<void> {
throw new Error("Method not implemented.");
}
}