inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/core/services/translate-loader.service.ts
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();
}, () => {