fix(TranslateService): Don't throw when trying to use get too early

ngx-translate · Jan 17, 2016 · 2af0b91 · 2af0b91
1 parent 98f90c8
commit 2af0b91
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/translate.service.ts b/src/translate.service.ts
@@ -165,17 +165,19 @@ export class TranslateService {
         }
 
         var getParsedResult = (translations: any, key: any) => {
-            if(!translations) {
-                return key;
-            }
+            var res: string;
+
             if(key instanceof Array) {
                 let result: any = {};
                 for (var k of key) {
                     result[k] = getParsedResult(translations, k);
                 }
                 return result;
             }
-            var res: string = this.parser.interpolate(translations[key], interpolateParams);
+
+            if(translations) {
+                res = this.parser.interpolate(translations[key], interpolateParams);
+            }
 
             if(typeof res === 'undefined' && this.defaultLang && this.defaultLang !== this.currentLang) {
                 let translations: any = this.parser.flattenObject(this.translations[this.defaultLang]);
@@ -191,7 +193,12 @@ export class TranslateService {
                 return getParsedResult(this.parser.flattenObject(res), key);
             });
         } else {
-            let translations: any = this.parser.flattenObject(this.translations[this.currentLang]);
+            let translations: any;
+
+            if(this.translations[this.currentLang]) {
+                translations = this.parser.flattenObject(this.translations[this.currentLang]);
+            }
+
             return Observable.of(getParsedResult(translations, key));
         }
     }

diff --git a/tests/translate.service.spec.ts b/tests/translate.service.spec.ts
@@ -13,7 +13,7 @@ export function main() {
         let injector: Injector;
         let backend: MockBackend;
         let translate: TranslateService;
-        var connection: MockConnection; // this will be set when a new connection is emitted from the backend.
+        let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
 
         var prepareStaticTranslate = (lang: string = 'en') => {
             // this will load translate json files from src/public/i18n
@@ -93,6 +93,12 @@ export function main() {
             mockBackendResponse('{}');
         });
 
+        it("should return the key when you haven't defined any translation", () => {
+            translate.get('TEST').subscribe((res: string) => {
+                expect(res).toEqual('TEST');
+            });
+        });
+
         it('should be able to get translations with params', () => {
             prepareStaticTranslate();