From 2ecfe541064ad6303f350e2099959cd91b99a52e Mon Sep 17 00:00:00 2001
From: Diego Rey <diego.despaux@izundo.com>
Date: Sun, 25 Nov 2018 21:50:03 -0300
Subject: [PATCH] Fix language switcher
---
.../src/app/login/login.component.html | 8 +++++++-
.../src/app/login/login.component.ts | 17 +++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/Frontend Angular 4/src/app/login/login.component.html b/Frontend Angular 4/src/app/login/login.component.html
index aa35b41..51805f4 100755
--- a/Frontend Angular 4/src/app/login/login.component.html
+++ b/Frontend Angular 4/src/app/login/login.component.html
@@ -9,7 +9,13 @@
</div>
<div class="form-group">
- <input type="password" [(ngModel)]=model.password (keyup.enter)=login() name="password" class="form-control input-underline input-lg" placeholder='{{ "i18n.object.password" | translate | titleCase }}'>
+ <input
+ type="password"
+ [(ngModel)]=model.password
+ (keyup.enter)=login()
+ name="password"
+ class="form-control input-underline input-lg"
+ placeholder='{{ "i18n.object.password" | translate | titleCase }}'>
</div>
<div class="form-group" style="margin-bottom: 0px; text-align: left;">
<div ngbDropdown class="d-inline-block language-switcher">
diff --git a/Frontend Angular 4/src/app/login/login.component.ts b/Frontend Angular 4/src/app/login/login.component.ts
index 49d9079..d7a6dd2 100755
--- a/Frontend Angular 4/src/app/login/login.component.ts
+++ b/Frontend Angular 4/src/app/login/login.component.ts
@@ -37,6 +37,12 @@ export class LoginComponent implements OnInit {
) { }
ngOnInit() {
+ let currentSession = sessionStorage.getItem("currentUser");
+ let langCode = currentSession ? JSON.parse(currentSession).language : 'es';
+ if (langCode) {
+ this.model.language = this.getLanguageElementByCode(langCode);
+ }
+
// reset login status
this.authenticationService.logout();
@@ -84,4 +90,15 @@ export class LoginComponent implements OnInit {
this.translate.use(this.model.language.code);
}
+ getLanguageElementByCode(code) {
+ let langElement = null;
+ for(let lang of this.languages) {
+ if (lang.code === code) {
+ langElement = lang;
+ break;
+ }
+ };
+ return langElement;
+ }
+
}
--
GitLab