Merge branch 'Dinistro-issue53'

ngx-translate · Mar 19, 2016 · 4a52e50 · 4a52e50
2 parents 28eda37 + 8200127
commit 4a52e50
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/bundles/ng2-translate.js b/bundles/ng2-translate.js
@@ -385,7 +385,7 @@ System.registerDynamic("src/translate.parser", [], true, function($__require, ex
       key = '';
       do {
         key += keys.shift();
-        if (target[key]) {
+        if (target[key] && (typeof target[key] === 'object' || !keys.length)) {
           target = target[key];
           key = '';
         } else if (!keys.length) {

diff --git a/src/translate.parser.ts b/src/translate.parser.ts
@@ -32,7 +32,7 @@ export class Parser {
         key = '';
         do {
             key += keys.shift();
-            if (target[key]) {
+            if (target[key] && (typeof target[key] === 'object' || !keys.length)) {
                 target = target[key];
                 key = '';
             } else if (!keys.length) {

diff --git a/tests/translate.parser.spec.ts b/tests/translate.parser.spec.ts
@@ -33,6 +33,10 @@ export function main() {
             expect(parser.getValue({key1: {'key2.key3': "value3"}}, 'key1.key2.key3')).toEqual("value3");
             expect(parser.getValue({'key1.key2.key3': "value3"}, 'key1.key2.key3')).toEqual("value3");
             expect(parser.getValue({'key1.key2': {key3: "value3"}}, 'key1.key2.keyWrong')).not.toBeDefined();
+            expect(parser.getValue({
+                'key1': "value1",
+                'key1.key2' : "value2"
+            }, 'key1.key2')).toEqual("value2");
 
         });
     });