From 80c8aebb7a11a8cda475cdc583797cdaa49127d9 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Wed, 8 Dec 2021 20:37:17 +0200
Subject: [PATCH] removed useless language service logic and added readonly
 keys

---
 apps/red-ui/src/app/app.module.ts                       | 6 ------
 apps/red-ui/src/app/i18n/language.service.ts            | 7 +------
 apps/red-ui/src/app/services/user-preference.service.ts | 8 +++++---
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts
index 375d7d8ab..1ae19dd51 100644
--- a/apps/red-ui/src/app/app.module.ts
+++ b/apps/red-ui/src/app/app.module.ts
@@ -111,12 +111,6 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp
             multi: true,
             useClass: HttpCacheInterceptor,
         },
-        /*{
-            provide: APP_INITIALIZER,
-            multi: true,
-            useFactory: languageInitializer,
-            deps: [LanguageService],
-        },*/
         {
             provide: APP_INITIALIZER,
             multi: true,
diff --git a/apps/red-ui/src/app/i18n/language.service.ts b/apps/red-ui/src/app/i18n/language.service.ts
index 3766af790..d7a5b0c98 100644
--- a/apps/red-ui/src/app/i18n/language.service.ts
+++ b/apps/red-ui/src/app/i18n/language.service.ts
@@ -19,15 +19,10 @@ export class LanguageService {
     }
 
     chooseAndSetInitialLanguage() {
-        let defaultLang: string;
+        let defaultLang = 'en';
         const userPreferenceLang = this._userPreferenceService.getLanguage();
-        const browserLang = 'en'; // Force language to english until translations are ready
         if (this.languageAvailable(userPreferenceLang)) {
             defaultLang = userPreferenceLang;
-        } else if (this.languageAvailable(browserLang)) {
-            defaultLang = browserLang;
-        } else {
-            defaultLang = 'en';
         }
         document.documentElement.lang = defaultLang;
         this._translateService.setDefaultLang(defaultLang);
diff --git a/apps/red-ui/src/app/services/user-preference.service.ts b/apps/red-ui/src/app/services/user-preference.service.ts
index a0927fca5..eebe4340f 100644
--- a/apps/red-ui/src/app/services/user-preference.service.ts
+++ b/apps/red-ui/src/app/services/user-preference.service.ts
@@ -3,6 +3,8 @@ import { GenericService, List, RequiredParam, Validate } from '@iqser/common-ui'
 
 type UserAttributes = Record<string, List>;
 
+const KEYS = ['Language', 'Dossier-Recent'];
+
 @Injectable({
     providedIn: 'root',
 })
@@ -28,13 +30,13 @@ export class UserPreferenceService extends GenericService<UserAttributes> {
     }
 
     async saveLastOpenedFileForDossier(dossierId: string, fileId: string): Promise<void> {
-        const key = `Dossier-Recent-${dossierId}`;
+        const key = `${KEYS[1]}-${dossierId}`;
         this.userAttributes[key] = [fileId];
         await this.savePreferences([fileId], key).toPromise();
     }
 
     getLanguage(): string {
-        const key = 'Language';
+        const key = KEYS[0];
         if (this.userAttributes[key]?.length > 0) {
             return this.userAttributes[key][0];
         }
@@ -42,7 +44,7 @@ export class UserPreferenceService extends GenericService<UserAttributes> {
     }
 
     async saveLanguage(language: string): Promise<void> {
-        const key = 'Language';
+        const key = KEYS[0];
         this.userAttributes[key] = [language];
         await this.savePreferences([language], key).toPromise();
     }