feat(TranslateService): added new merging option when setting transla…

…tions
ngx-translate · Aug 13, 2016 · 4a8fb83 · 4a8fb83
1 parent 2480795
commit 4a8fb83
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/translate.service.ts b/src/translate.service.ts
@@ -135,8 +135,12 @@ export class TranslateService {
      * @param lang
      * @param translations
      */
-    public setTranslation(lang: string, translations: Object): void {
-        this.translations[lang] = translations;
+    public setTranslation(lang: string, translations: Object, shouldMerge: boolean = false): void {
+        if (shouldMerge && this.translations[lang]) {
+            Object.assign(this.translations[lang], translations);
+        } else {
+            this.translations[lang] = translations;
+        }
         this.updateLangs();
     }
 

diff --git a/tests/translate.service.spec.ts b/tests/translate.service.spec.ts
@@ -149,6 +149,18 @@ export function main() {
             });
         });
 
+        it("shouldn't override the translations if you set the translations twice ", (done: Function) => {
+            translate.setTranslation('en', {"TEST": "This is a test"}, true);
+            translate.setTranslation('en', {"TEST2": "This is a test"}, true);
+            translate.use('en');
+
+            translate.get('TEST').subscribe((res: string) => {
+                expect(res).toEqual('This is a test');
+                expect(connection).not.toBeDefined();
+                done();
+            });
+        });
+
         it("shouldn't do a request to the backend if you set the translation yourself", (done: Function) => {
             translate.setTranslation('en', {"TEST": "This is a test"});
             translate.use('en');