Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

removed useless language service logic and added readonly keys

Browse Source
This commit is contained in:
Edi Cziszter 2021-12-08 20:37:17 +02:00
parent 875b80ab45
commit 80c8aebb7a
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/app.module.ts
View File

@ -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,

7
apps/red-ui/src/app/i18n/language.service.ts
View File

@ -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);

8
apps/red-ui/src/app/services/user-preference.service.ts
View File

@ -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();
}