From 272090151b02c6c7ab9df920413881380659e48a Mon Sep 17 00:00:00 2001
From: baso10 <baso10dev@gmail.com>
Date: Fri, 16 Mar 2018 12:30:23 +0100
Subject: [PATCH] use rxjs/Observable and change http.get error handling

---
 src/http-loader.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/http-loader.ts b/src/http-loader.ts
index 87be1d1..ad6e9b5 100644
--- a/src/http-loader.ts
+++ b/src/http-loader.ts
@@ -1,6 +1,6 @@
 import {HttpClient} from "@angular/common/http";
 import {TranslateLoader} from "@ngx-translate/core";
-import {Observable} from 'rxjs/Rx';
+import {Observable} from 'rxjs/Observable';
 
 export class TranslateHttpLoader implements TranslateLoader {
     loadedTranslations: { [index: string]: Object; } = {};
@@ -27,13 +27,13 @@ export class TranslateHttpLoader implements TranslateLoader {
     public preLoad(lang: string): Promise<any> {
         return new Promise((resolve, reject) => {
                 this.http.get(`${this.prefix}${lang}${this.suffix}`)
-            .catch((error: any): any => {
-                resolve(null);
-            })
-            .subscribe((result) => {
+            .subscribe(
+              result => {
                 this.loadedTranslations[lang] = result;
                 resolve(result);
-            });
+              },
+              error => {resolve(null)}
+            );
         });
     }
 }