Moved function to translations into the TranslationStore.

getValue() is protected and can be overwritten.
Fixed some lint warnings.

Author: CodeAndWeb

projects/ngx-translate/src/lib/translate.service.ts

@@ -6,7 +6,7 @@ import {TranslateCompiler} from "./translate.compiler";
 import {TranslateLoader} from "./translate.loader";
 import {InterpolateFunction, TranslateParser} from "./translate.parser";
 import {TranslateStore} from "./translate.store";
-import {getValue, isDefined, isArray, isString, setValue, isDict, insertValue} from "./util";
+import {isDefined, isArray, isString, isDict, insertValue} from "./util";
 
 export const ISOLATE_TRANSLATE_SERVICE = new InjectionToken<string>('ISOLATE_TRANSLATE_SERVICE');
 export const USE_DEFAULT_LANG = new InjectionToken<string>('USE_DEFAULT_LANG');
@@ -367,12 +367,7 @@ export class TranslateService {
 
   private getTextToInterpolate(key: string): InterpolatableTranslation | undefined
   {
-      let text = getValue(this.store.getTranslations(this.currentLang), key);
-      if(text === undefined && this.defaultLang != null && this.defaultLang !== this.currentLang && this.useDefaultLang)
-      {
-          text = getValue(this.store.getTranslations(this.defaultLang), key);
-      }
-      return text;
+    return this.store.getTranslation(key, this.useDefaultLang);
   }
 
   private runInterpolation(translations: InterpolatableTranslation, interpolateParams?: InterpolationParameters): Translation
@@ -444,7 +439,7 @@ export class TranslateService {
     // check if we are loading a new translation to use
     if (this.pending) {
       return this.loadingTranslations.pipe(
-        concatMap((res: InterpolatableTranslation) => {
+        concatMap(() => {
           return makeObservable(this.getParsedResult(key, interpolateParams));
         }),
       );
@@ -466,7 +461,7 @@ export class TranslateService {
     return concat(
       defer(() => this.get(key, interpolateParams)),
       this.onTranslationChange.pipe(
-        switchMap((event: TranslationChangeEvent) => {
+        switchMap(() => {
           const res = this.getParsedResult(key, interpolateParams);
           return makeObservable(res);
         })
@@ -487,7 +482,7 @@ export class TranslateService {
     return concat(
       defer(() => this.get(key, interpolateParams)),
       this.onLangChange.pipe(
-        switchMap((event: LangChangeEvent) => {
+        switchMap(() => {
           const res = this.getParsedResult(key, interpolateParams);
           return makeObservable(res);
         })

projects/ngx-translate/src/lib/translate.store.ts

@@ -2,10 +2,10 @@ import {
     InterpolatableTranslationObject,
     DefaultLangChangeEvent,
     LangChangeEvent,
-    TranslationChangeEvent, Language
+    TranslationChangeEvent, Language, InterpolatableTranslation
 } from "./translate.service";
 import {Observable, Subject} from "rxjs";
-import {mergeDeep} from "./util";
+import {getValue, mergeDeep} from "./util";
 
 
 type DeepReadonly<T> = {
@@ -19,13 +19,13 @@ export class TranslateStore
     private _onLangChange: Subject<LangChangeEvent> = new Subject<LangChangeEvent>();
     private _onDefaultLangChange: Subject<DefaultLangChangeEvent> = new Subject<DefaultLangChangeEvent>();
 
-    private _defaultLang!: Language;
+    private defaultLang!: Language;
     private currentLang!: Language;
 
     private translations: Record<Language, InterpolatableTranslationObject> = {};
     private languages: Language[] = [];
 
-    public getTranslations(language:Language): DeepReadonly<Record<Language, InterpolatableTranslationObject>>
+    public getTranslations(language:Language): DeepReadonly<InterpolatableTranslationObject>
     {
         return this.translations[language];
     }
@@ -49,15 +49,15 @@ export class TranslateStore
 
     public getDefaultLanguage(): Language
     {
-        return this._defaultLang;
+        return this.defaultLang;
     }
 
     /**
      * Changes the default lang
      */
     public setDefaultLang(lang: string, emitChange = true): void
     {
-        this._defaultLang = lang;
+        this.defaultLang = lang;
         if (emitChange)
         {
             this._onDefaultLangChange.next({lang: lang, translations: this.translations[lang]});
@@ -127,4 +127,19 @@ export class TranslateStore
     {
         delete this.translations[lang];
     }
+
+    public getTranslation(key: string, useDefaultLang: boolean): InterpolatableTranslation
+    {
+        let text = this.getValue(this.currentLang, key);
+        if(text === undefined && this.defaultLang != null && this.defaultLang !== this.currentLang && useDefaultLang)
+        {
+            text = this.getValue(this.defaultLang, key);
+        }
+        return text;
+    }
+
+    protected getValue(language: Language, key: string): InterpolatableTranslation
+    {
+        return getValue(this.getTranslations(language), key) as InterpolatableTranslation;
+    }
 }