Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Consider language from user settings (#1179)

Thomas Kaul56bf42240723
diff --git a/apps/api/src/app/user/update-user-setting.dto.ts b/apps/api/src/app/user/update-user-setting.dto.ts
index b97dd287e7..f458294f8f 100644
--- a/apps/api/src/app/user/update-user-setting.dto.ts
+++ b/apps/api/src/app/user/update-user-setting.dto.ts
@@ -9,6 +9,10 @@ export class UpdateUserSettingDto {
@IsOptional()
isRestrictedView?: boolean;
+ @IsString()
+ @IsOptional()
+ language?: string;
+
@IsString()
@IsOptional()
locale?: string;
diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts
index 6161df1f22..2daf2fab7d 100644
--- a/apps/client/src/app/core/auth.guard.ts
+++ b/apps/client/src/app/core/auth.guard.ts
@@ -72,7 +72,13 @@ export class AuthGuard implements CanActivate {
})
)
.subscribe((user) => {
- if (
+ const userLanguage = user?.settings?.language;
+
+ if (userLanguage && document.documentElement.lang !== userLanguage) {
+ window.location.href = `../${userLanguage}`;
+ resolve(false);
+ return;
+ } else if (
state.url.startsWith('/home') &&
user.settings.viewMode === ViewMode.ZEN
) {
diff --git a/apps/client/src/app/pages/account/account-page.component.ts b/apps/client/src/app/pages/account/account-page.component.ts
index 3d05331643..7c97fef6f6 100644
--- a/apps/client/src/app/pages/account/account-page.component.ts
+++ b/apps/client/src/app/pages/account/account-page.component.ts
@@ -149,10 +149,6 @@ export class AccountPageComponent implements OnDestroy, OnInit {
this.update();
}
- public onChangeLanguage(aLanguage: string) {
- window.location.href = `../${aLanguage}/account`;
- }
-
public onChangeUserSetting(aKey: string, aValue: string) {
this.dataService
.putUserSetting({ [aKey]: aValue })
@@ -167,6 +163,14 @@ export class AccountPageComponent implements OnDestroy, OnInit {
this.user = user;
this.changeDetectorRef.markForCheck();
+
+ if (aKey === 'language') {
+ if (aValue) {
+ window.location.href = `../${aValue}/account`;
+ } else {
+ window.location.href = `../`;
+ }
+ }
});
});
}
diff --git a/apps/client/src/app/pages/account/account-page.html b/apps/client/src/app/pages/account/account-page.html
index e72acd2b9f..335ec69f6d 100644
--- a/apps/client/src/app/pages/account/account-page.html
+++ b/apps/client/src/app/pages/account/account-page.html
@@ -120,8 +120,9 @@
<mat-select
name="language"
[value]="language"
- (selectionChange)="onChangeLanguage($event.value)"
+ (selectionChange)="onChangeUserSetting('language', $event.value)"
>
+ <mat-option [value]="null"></mat-option>
<mat-option value="de">Deutsch</mat-option>
<mat-option value="en">English</mat-option>
</mat-select>
diff --git a/libs/common/src/lib/interfaces/user-settings.interface.ts b/libs/common/src/lib/interfaces/user-settings.interface.ts
index d81f67f369..2fd2bbb2d2 100644
--- a/libs/common/src/lib/interfaces/user-settings.interface.ts
+++ b/libs/common/src/lib/interfaces/user-settings.interface.ts
@@ -3,6 +3,7 @@ import { ViewMode } from '@prisma/client';
export interface UserSettings {
baseCurrency?: string;
isRestrictedView?: boolean;
+ language?: string;
locale: string;
viewMode?: ViewMode;
}