From acb091802c51ee7d1fad0b0ae08597da87cf3c52 Mon Sep 17 00:00:00 2001 From: tykayn Date: Sat, 11 Apr 2020 17:07:38 +0200 Subject: [PATCH] :zap: :alien: Conserver le choix de langue au rechargement de la page - issue #54 --- src/app/services/config.service.ts | 4 +++- .../selector/language/language.component.ts | 20 ++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/app/services/config.service.ts b/src/app/services/config.service.ts index 0705b1ba..d55342d1 100644 --- a/src/app/services/config.service.ts +++ b/src/app/services/config.service.ts @@ -10,7 +10,9 @@ import {mockSuccessVote} from '../config/mocks/mock-success-vote'; import {PollUtilities} from '../config/PollUtilities'; const LocalstoragePreferences = { - themeName: 'light-watermelon' + themeName: 'light-watermelon', + themeClass: 'theme-light-watermelon', + lang: 'fr', }; /** diff --git a/src/app/ui/selector/language/language.component.ts b/src/app/ui/selector/language/language.component.ts index 63185c61..5e81b387 100644 --- a/src/app/ui/selector/language/language.component.ts +++ b/src/app/ui/selector/language/language.component.ts @@ -26,15 +26,29 @@ export class LanguageComponent implements OnInit { @Inject(DOCUMENT) private document, private route: Router) { - this.translate.setDefaultLang(this.currentLang); + } ngOnInit(): void { + console.log('this.config.preferences', this.config.preferences) + if (this.config.preferences.lang) { + this.switchLanguage(this.config.preferences.lang); + } else { + this.switchLanguage(this.currentLang); + } } switchLanguage(language: string) { - this.translate.use(language); - this.currentLang = language; + if (this.langsAvailable.includes(language)) { + + this.translate.use(language); + this.currentLang = language; + this.config.setPreference('lang', language); + this.translate.setDefaultLang(this.currentLang); + + } else { + console.error('this lang is not supported'); + } } /**