@eo-sdk/client 8.0.0-rc.4 → 8.0.0-rc.7

package/fesm2015/eo-sdk-client-projects-eo-sdk-core.js

@@ -2,9 +2,11 @@ import { TranslateService, TranslateModule, TranslateLoader, MissingTranslationH
 export { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { InjectionToken, Inject, Injectable, ɵɵdefineInjectable, ɵɵinject, NgZone, NgModule, APP_INITIALIZER, Optional, SkipSelf } from '@angular/core';
 import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-import { of, forkJoin, EMPTY, throwError, Subject, Observable, ReplaySubject, BehaviorSubject, timer, interval } from 'rxjs';
-import { catchError, map, filter, debounceTime, switchMap, first, tap, finalize, shareReplay, mergeMap, expand, skipWhile, takeUntil } from 'rxjs/operators';
+import { forkJoin, of, EMPTY, throwError, Subject, Observable, ReplaySubject, BehaviorSubject, timer, interval } from 'rxjs';
+import { map, catchError, filter, debounceTime, switchMap, first, tap, finalize, shareReplay, mergeMap, expand, skipWhile, takeUntil } from 'rxjs/operators';
 import { registerLocaleData, PlatformLocation, DatePipe } from '@angular/common';
+import localeDeCh from '@angular/common/locales/de-CH';
+import localeExtraDeCh from '@angular/common/locales/extra/de-CH';
 import localeDe from '@angular/common/locales/de';
 import localeExtraDe from '@angular/common/locales/extra/de';
 import localeAr from '@angular/common/locales/ar';
@@ -120,6 +122,7 @@ class EoxTranslateJsonLoader {
         registerLocaleData(localeKo, 'ko', localeExtraKo); // Korean
         registerLocaleData(localeHi, 'hi', localeExtraHi); // Hindi
         registerLocaleData(localeBn, 'bn', localeExtraBn); // Bengalese
+        registerLocaleData(localeDeCh, 'de-CH', localeExtraDeCh); // German (switzerland)
     }
     /**
      *
@@ -127,10 +130,14 @@ class EoxTranslateJsonLoader {
      * @returns Observable<Object>
      */
     getTranslation(lang) {
-        const t = this.config.translations.map(folder => this.http.get(`${folder}${lang}.json`)
-            .pipe(catchError((e) => of({}))));
-        return forkJoin(t).pipe(map((res) => {
-            return res.reduce((acc, x) => Object.assign(acc, x), {});
+        return forkJoin(this.config.translations.map(folder => this.loadTranslationFile(folder, lang))).pipe(map((res) => res.reduce((acc, x) => Object.assign(acc, x), {})));
+    }
+    loadTranslationFile(folder, lang) {
+        return this.http.get(`${folder}${lang}.json`).pipe(catchError((e) => {
+            // ISO codes with more than 2 characters are sub-languages like de-CH.
+            // If there is no translation file for that sub-language we'll try to load 
+            // the file for the base language (in this case de).
+            return lang.length > 2 ? this.loadTranslationFile(folder, lang.substring(0, 2)) : of({});
         }));
     }
 }