Fixed the issue to fetch undefined.json

alvachien · Apr 10, 2017 · 838d1ba · 838d1ba
1 parent 98093f5
commit 838d1ba
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 29 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -23,21 +23,31 @@ export class AppComponent implements OnInit {
     private _domSanitizer: DomSanitizer,
     viewContainerRef: ViewContainerRef) {
     if (environment.DebugLogging) {
-      console.log("Entering constructor of AppComponent");
+      console.log("ACHIHUI Log: Entering constructor of AppComponent");
     }
 
     let arlang: string[] = [];
     for(let ap of this._uistatus.arLang)
       arlang.push(ap.IsoName);
     this._translateService.addLangs(arlang);
-    this._translateService.setDefaultLang(this._uistatus.curLang);
+    this._translateService.setDefaultLang(this._uistatus.curLang ? this._uistatus.curLang : "en");
+
     this._uistatus.obsCurLanguage.subscribe(x => {
-      this._translateService.setDefaultLang(x);
+      if (environment.DebugLogging) {
+        console.log("ACHIHUI Log: Entering current language change in AppComponent: " + x);
+      }
+      if (x) {
+        this._translateService.use(x);
+      }      
     }, error => {
     }, () => {
     });
 
     this._authService.authContent.subscribe(x => {
+      if (environment.DebugLogging) {
+        console.log("ACHIHUI Log: Entering subscribe of authContent in AppComponent");
+      }
+
       this._uistatus.setIsLogin(x.isAuthorized);
     });
 
@@ -55,7 +65,7 @@ export class AppComponent implements OnInit {
 
   ngOnInit() {
     if (environment.DebugLogging) {
-      console.log("Entering ngOnInit of AppComponent");
+      console.log("ACHIHUI Log: Entering ngOnInit of AppComponent");
     }
   }
 }
diff --git a/src/app/finance/finance.component.ts b/src/app/finance/finance.component.ts
@@ -36,7 +36,7 @@ export class FinanceComponent implements OnInit {
     private _translateService: TranslateService,
     viewContainerRef: ViewContainerRef) {
     if (environment.DebugLogging) {
-      console.log("Entering constructor of FinanceComponent");
+      console.log("ACHIHUI Log: Entering constructor of FinanceComponent");
     }
     this.arLanguages = new Array<AppLanguage>();
 
@@ -58,14 +58,6 @@ export class FinanceComponent implements OnInit {
       this.arLanguages.push(ap);
       arlang.push(ap.IsoName);
     }
-    this._translateService.addLangs(arlang);
-    this._translateService.setDefaultLang(this._uistatus.curLang);
-
-    this._uistatus.obsCurLanguage.subscribe(x => {
-      this._translateService.setDefaultLang(x);
-    }, error => {
-    }, () => {
-    });
 
     this._iconRegistry.addSvgIconInNamespace('assets', 'github',
       this._domSanitizer.bypassSecurityTrustResourceUrl('assets/icons/github.svg'));
@@ -160,6 +152,8 @@ export class FinanceComponent implements OnInit {
     this.libraryMenuToggled = !this.libraryMenuToggled;
   }
   public onLanguageClick(lang: AppLanguage) : void {
-    this._uistatus.setCurrentLanguage(lang.IsoName);
+    if (lang.IsoName !== this._uistatus.curLang) {
+      this._uistatus.setCurrentLanguage(lang.IsoName);
+    }
   }
 }
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
@@ -2,7 +2,7 @@
   <td-navigation-drawer flex icon="event_seat" sidenavTitle="H.I.H." name="{{ titleLogin }}" (logout)="onLogout()">
     <div td-sidenav-content *ngIf="!isLoggedIn">
       <md-nav-list menu-items>
-        <a md-list-item (click)="onLogin()">{{"Login.Login" | translate }</a>
+        <a md-list-item (click)="onLogin()">{{"Login.Login" | translate }}</a>
       </md-nav-list>
     </div>
     <div td-sidenav-content *ngIf="isLoggedIn">

diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit }  from '@angular/core';
 import { UIStatusService } from '../services/uistatus.service';
 import { AuthService } from '../services/auth.service';
 import { AppLanguage } from '../model/common';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'hih-home',
@@ -23,7 +24,8 @@ export class HomeComponent implements OnInit {
 
   constructor(
     private _authService: AuthService,
-    private _uistatus: UIStatusService
+    private _uistatus: UIStatusService,
+    private _translateService: TranslateService
   ) { 
     this.arLanguages = new Array<AppLanguage>();
 
@@ -66,9 +68,7 @@ export class HomeComponent implements OnInit {
     this._uistatus.obsFinanceRouteList.subscribe(x => {
       this.financeRoutes = x;
     }, error => {
-
     }, () => {
-
     });
     this._uistatus.obsLibraryRouteList.subscribe(x => {
       this.libraryRoutes = x;
@@ -107,6 +107,8 @@ export class HomeComponent implements OnInit {
   }
 
   public onLanguageClick(lang: AppLanguage) : void {
-    this._uistatus.setCurrentLanguage(lang.IsoName);
+    if (lang.IsoName !== this._uistatus.curLang) {
+      this._uistatus.setCurrentLanguage(lang.IsoName);
+    }
   }
 }
diff --git a/src/app/learn/learn.component.ts b/src/app/learn/learn.component.ts
@@ -45,14 +45,6 @@ export class LearnComponent implements OnInit {
       arlang.push(ap.IsoName);
     }
 
-    this._translateService.addLangs(arlang);
-    this._translateService.setDefaultLang(this._uistatus.curLang);
-    this._uistatus.obsCurLanguage.subscribe(x => {
-      this._translateService.setDefaultLang(x);
-    }, error => {
-    }, () => {
-    });
-
     this._iconRegistry.addSvgIconInNamespace('assets', 'github',
       this._domSanitizer.bypassSecurityTrustResourceUrl('assets/icons/github.svg'));
     this._iconRegistry.addSvgIconInNamespace('assets', 'angular',
@@ -161,6 +153,8 @@ export class LearnComponent implements OnInit {
     this.libraryMenuToggled = !this.libraryMenuToggled;
   }
   public onLanguageClick(lang: AppLanguage) : void {
-    this._uistatus.setCurrentLanguage(lang.IsoName);
+    if (lang.IsoName !== this._uistatus.curLang) {
+      this._uistatus.setCurrentLanguage(lang.IsoName);
+    }
   }
 }
diff --git a/src/app/services/uistatus.service.ts b/src/app/services/uistatus.service.ts
@@ -247,12 +247,17 @@ export class UIStatusService {
     if (environment.DebugLogging) {
       console.log("ACHIHUI Log: Entering setFinanceSubModule of UIStatusService with " + financeSubMod);
     }
+
     this.financeSubModule = financeSubMod;
     this.subjFinanceSubModule.next(this.financeSubModule);
   }
 
   public setCurrentLanguage(curlang: string): void {
-    if (curlang !== this.curLang) {
+    if (environment.DebugLogging) {
+      console.log("ACHIHUI Log: Entering setCurrentLanguage of UIStatusService with " + curlang);
+    }
+
+    if (curlang && curlang !== this.curLang) {
       // Check whether the new value is valid
       let bValid: boolean = false;
       for(let ap of this.arLang) {