Skip to content

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

Revert "Task/refactor language in various components (#6078)" (#6081)

Thomas Kaul1dd5ff51ee4d
diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index 053b6829c8..12a7b0de99 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -243,7 +243,7 @@ export class GfAppComponent implements OnDestroy, OnInit {
this.tokenStorageService.signOut();
this.userService.remove();
- document.location.href = `/${$localize.locale}`;
+ document.location.href = `/${document.documentElement.lang}`;
}
public ngOnDestroy() {
diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts
index c9aee671cd..99fbe7901d 100644
--- a/apps/client/src/app/components/admin-users/admin-users.component.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.component.ts
@@ -224,7 +224,7 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
this.tokenStorageService.signOut();
this.userService.remove();
- document.location.href = `/${$localize.locale}`;
+ document.location.href = `/${document.documentElement.lang}`;
}
},
message: accessToken,
diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts
index e26be812b9..b7bf4cb985 100644
--- a/apps/client/src/app/components/header/header.component.ts
+++ b/apps/client/src/app/components/header/header.component.ts
@@ -335,7 +335,7 @@ export class GfHeaderComponent implements OnChanges {
.subscribe((user) => {
const userLanguage = user?.settings?.language;
- if (userLanguage && $localize.locale !== userLanguage) {
+ if (userLanguage && document.documentElement.lang !== userLanguage) {
window.location.href = `../${userLanguage}`;
} else {
this.router.navigate(['/']);
diff --git a/apps/client/src/app/components/user-account-access/user-account-access.component.ts b/apps/client/src/app/components/user-account-access/user-account-access.component.ts
index 70d84a25ca..11960b8aa7 100644
--- a/apps/client/src/app/components/user-account-access/user-account-access.component.ts
+++ b/apps/client/src/app/components/user-account-access/user-account-access.component.ts
@@ -164,7 +164,7 @@ export class GfUserAccountAccessComponent implements OnDestroy, OnInit {
this.tokenStorageService.signOut();
this.userService.remove();
- document.location.href = `/${$localize.locale}`;
+ document.location.href = `/${document.documentElement.lang}`;
},
message: accessToken,
title: $localize`Security token`
diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
index 7344013d25..e174256760 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.component.ts
@@ -78,8 +78,7 @@ export class GfUserAccountSettingsComponent implements OnDestroy, OnInit {
public isAccessTokenHidden = true;
public isFingerprintSupported = this.doesBrowserSupportAuthn();
public isWebAuthnEnabled: boolean;
- public language = $localize.locale;
-
+ public language = document.documentElement.lang;
public locales = [
'ca',
'de',
@@ -200,7 +199,7 @@ export class GfUserAccountSettingsComponent implements OnDestroy, OnInit {
this.tokenStorageService.signOut();
this.userService.remove();
- document.location.href = `/${this.language}`;
+ document.location.href = `/${document.documentElement.lang}`;
});
},
confirmType: ConfirmationDialogType.Warn,
diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts
index fd72679164..c264190315 100644
--- a/apps/client/src/app/core/auth.guard.ts
+++ b/apps/client/src/app/core/auth.guard.ts
@@ -64,9 +64,9 @@ export class AuthGuard {
.subscribe((user) => {
const userLanguage = user?.settings?.language;
- if (userLanguage && $localize.locale !== userLanguage) {
+ if (userLanguage && document.documentElement.lang !== userLanguage) {
this.dataService
- .putUserSetting({ language: $localize.locale })
+ .putUserSetting({ language: document.documentElement.lang })
.subscribe(() => {
this.userService.remove();
diff --git a/apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts b/apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts
index 6f0b1baba0..8faa8307ec 100644
--- a/apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts
+++ b/apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts
@@ -22,7 +22,7 @@ import { Subject, takeUntil } from 'rxjs';
templateUrl: './faq-overview-page.html'
})
export class GfFaqOverviewPageComponent implements OnDestroy {
- public pricingUrl = `https://ghostfol.io/${$localize.locale}/${publicRoutes.pricing.path}`;
+ public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${publicRoutes.pricing.path}`;
public routerLinkFeatures = publicRoutes.features.routerLink;
public user: User;
diff --git a/apps/client/src/app/pages/faq/saas/saas-page.component.ts b/apps/client/src/app/pages/faq/saas/saas-page.component.ts
index cc5a4d6429..b47d45fe22 100644
--- a/apps/client/src/app/pages/faq/saas/saas-page.component.ts
+++ b/apps/client/src/app/pages/faq/saas/saas-page.component.ts
@@ -22,7 +22,7 @@ import { Subject, takeUntil } from 'rxjs';
templateUrl: './saas-page.html'
})
export class GfSaasPageComponent implements OnDestroy {
- public pricingUrl = `https://ghostfol.io/${$localize.locale}/${publicRoutes.pricing.path}`;
+ public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${publicRoutes.pricing.path}`;
public routerLinkAccount = internalRoutes.account.routerLink;
public routerLinkAccountMembership =
internalRoutes.account.subRoutes.membership.routerLink;
diff --git a/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts b/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts
index 03d6a6742e..ed1d743957 100644
--- a/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts
+++ b/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts
@@ -15,7 +15,7 @@ import { Subject } from 'rxjs';
templateUrl: './self-hosting-page.html'
})
export class GfSelfHostingPageComponent implements OnDestroy {
- public pricingUrl = `https://ghostfol.io/${$localize.locale}/${publicRoutes.pricing.path}`;
+ public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${publicRoutes.pricing.path}`;
private unsubscribeSubject = new Subject<void>();