bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 01:33:33 +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

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> {

4
libs/common/src/platform/state/implementations/default-active-user-state.ts
View File

@@ -173,7 +173,9 @@ export class DefaultActiveUserState<T> implements ActiveUserState<T> {
),
);
if (userId == null) {
throw new Error("No active user at this time.");
throw new Error(
`Error storing ${this.keyDefinition.fullName} for the active user: No active user at this time.`,
);
}
const fullKey = this.keyDefinition.buildKey(userId);
return [

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.");
}
}