Merge pull request #7173 from coderNadir/fix-#7121

[Fix] language reset to default (en-english) on logout
ever-co · Nov 23, 2023 · 73ba006 · 73ba006
2 parents 00816b9 + a766030
commit 73ba006
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/apps/gauzy/src/app/@core/auth/auth-strategy.service.ts b/apps/gauzy/src/app/@core/auth/auth-strategy.service.ts
@@ -264,10 +264,12 @@ export class AuthStrategy extends NbAuthStrategy {
 	}
 
 	private async _logout(): Promise<NbAuthResult> {
+		const preferredLanguage = this.store.preferredLanguage;
 		this.logout$.next(true);
 
 		this.store.clear();
 		this.store.serverConnection = 200;
+		this.store.preferredLanguage = preferredLanguage;
 		if (this.electronService.isElectron) {
 			this.electronService.ipcRenderer.send('logout');
 		}

diff --git a/apps/gauzy/src/app/app.component.ts b/apps/gauzy/src/app/app.component.ts
@@ -25,6 +25,7 @@ import {
 } from './@core/services';
 import { environment } from '../environments/environment';
 import { JitsuService } from './@core/services/analytics/jitsu.service';
+import { union } from 'underscore';
 
 @UntilDestroy({ checkProperties: true })
 @Component({
@@ -59,32 +60,37 @@ export class AppComponent implements OnInit, AfterViewInit {
 		this.seoService.trackCanonicalChanges();
 
 		this.store.systemLanguages$
-			.pipe(untilDestroyed(this))
-			.subscribe((languages) => {
-				//Returns the language code name from the browser, e.g. "en", "bg", "he", "ru"
-				const browserLang = this.translate.getBrowserLang();
-
-				//Gets default enum languages, e.g. "en", "bg", "he", "ru"
-				const defaultLanguages = Object.values(LanguagesEnum);
-
-				//Gets system languages
-				const systemLanguages: string[] = _.pluck(languages, 'code');
-				systemLanguages.concat(defaultLanguages);
-
-				//Sets the default language to use as a fallback, e.g. "en"
-				this.translate.setDefaultLang(LanguagesEnum.ENGLISH);
-
-				//Use browser language as a primary language, if not found then use system default language, e.g. "en"
-				this.translate.use(
-					systemLanguages.includes(browserLang)
-						? browserLang
-						: LanguagesEnum.ENGLISH
-				);
-
-				this.translate.onLangChange.subscribe(() => {
-					this.loading = false;
-				});
+		.pipe(untilDestroyed(this))
+		.subscribe((languages) => {
+			//Returns the language code name from the browser, e.g. "en", "bg", "he", "ru"
+			const browserLang = this.translate.getBrowserLang();
+
+			//Gets default enum languages, e.g. "en", "bg", "he", "ru"
+			const defaultLanguages = Object.values(LanguagesEnum);
+
+			//Gets system languages
+			let systemLanguages: string[] = _.pluck(languages, 'code');
+			systemLanguages = union(systemLanguages, defaultLanguages);
+
+			//Sets the default language to use as a fallback, e.g. "en"
+			this.translate.setDefaultLang(LanguagesEnum.ENGLISH);
+
+			//Get preferredLanguage if exist
+			const preferredLanguage = this.store?.user?.preferredLanguage ?? this.store.preferredLanguage ?? null;
+
+			//Use browser language as a primary language, if not found then use system default language, e.g. "en"
+			this.translate.use(
+				preferredLanguage
+					? preferredLanguage
+					: systemLanguages.includes(browserLang)
+					? browserLang
+					: LanguagesEnum.ENGLISH
+			);
+
+			this.translate.onLangChange.subscribe(() => {
+				this.loading = false;
 			});
+		});
 
 		if (Number(this.store.serverConnection) === 0) {
 			this.loading = false;