[ADF-2316] upgrade ngx-translate (#2956)

* upgrade ngx-translate

* add missing export

* add missing export

* Update test-e2e-bc.sh

* rxjs fixes

* increase timeout test

* lettable operator translate
This commit is contained in:
Denys Vuika
2018-02-20 18:39:57 +00:00
committed by Eugenio Romano
parent ed9289d6df
commit 2f69383c44
12 changed files with 18 additions and 14 deletions

View File

@@ -20,7 +20,6 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
import { NgModule, ModuleWithProviders } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
import { TranslateStore } from '@ngx-translate/core/src/translate.store';
import { MaterialModule } from './material.module';
import { AppConfigModule } from './app-config/app-config.module';
@@ -206,7 +205,6 @@ export class CoreModule {
source: 'assets/adf-core'
}
},
TranslateStore,
...providers()
]
};

View File

@@ -25,7 +25,7 @@
"@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.1.1",
"@ngx-translate/core": "8.0.0",
"@ngx-translate/core": "9.1.1",
"alfresco-js-api": "2.1.0",
"chart.js": "2.5.0",
"core-js": "2.4.1",

View File

@@ -23,6 +23,7 @@ import { Observable } from 'rxjs/Observable';
import { ComponentTranslationModel } from '../models/component.model';
import { ObjectUtils } from '../utils/object-utils';
import { LogService } from './log.service';
import { map } from 'rxjs/operators'
import 'rxjs/observable/forkJoin';
import 'rxjs/add/observable/forkJoin';
@@ -63,10 +64,9 @@ export class TranslateLoaderService implements TranslateLoader {
const loader = Observable.create(observer => {
const translationUrl = `${component.path}/${this.prefix}/${lang}${this.suffix}?v=${Date.now()}`;
this.http.get(translationUrl)
.map((res: Response) => {
component.json[lang] = res;
}).subscribe((result) => {
this.http.get(translationUrl).pipe(map((res: Response) => {
component.json[lang] = res;
})).subscribe((result) => {
observer.next(result);
observer.complete();
}, () => {