From 0028f91fd420ae6442e6984e101acfb29aef8737 Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Fri, 10 Jun 2016 15:45:27 +0100
Subject: [PATCH] #163 Fixed with empty Observable value

---
 ng2-components/ng2-alfresco-core/package.json   |  2 +-
 .../AlfrescoTranslationLoader.service.ts        | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index 3acca44b44..5229562a06 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ng2-alfresco-core",
   "description": "Alfresco Angular 2 Components core",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "typings": "typings install",
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.ts
index 7d214cd132..a88848e7e8 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationLoader.service.ts
@@ -43,7 +43,11 @@ export class AlfrescoTranslationLoader implements TranslateLoader {
         let observableBatch = [];
         this._componentList.forEach((component) => {
             observableBatch.push(this.http.get(`${component}/${self.prefix}/${lang}${self.suffix}`)
-                .map((res: Response) => res.json()));
+                .map((res: Response) => res.json())
+                .catch( (err: any, source: Observable<any>, caught: Observable<any>)  =>  {
+                    // Empty Observable just to go ahead
+                    return Observable.of('');
+                }));
         });
 
         return Observable.create(observer => {
@@ -51,10 +55,17 @@ export class AlfrescoTranslationLoader implements TranslateLoader {
                 (translations: any[]) => {
                     let multiLanguage: any = '';
                     translations.forEach((translate) => {
-                        multiLanguage += JSON.stringify(translate);
+                        if(translate !== '') {
+                            multiLanguage += JSON.stringify(translate);
+                        }
                     });
-                    observer.next(JSON.parse(multiLanguage.replace(/}{/g, ',')));
+                    if(multiLanguage !== '') {
+                        observer.next(JSON.parse(multiLanguage.replace(/}{/g, ',')));
+                    }
                     observer.complete();
+                },
+                (err: any) => {
+                        console.error(err);
                 });
         });
     }