bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 00:33:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into vault/pm-5273

Browse Source
This commit is contained in:
Carlos Gonçalves
2024-03-14 12:09:19 +00:00
parent add0c912e1 d28634b068
commit cf69056e48
9 changed files with 18 additions and 7 deletions
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 });