@onecx/angular-accelerator 5.12.1 → 5.12.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import { forkJoin, map } from 'rxjs';
|
|
1
|
+
import { catchError, forkJoin, map, of } from 'rxjs';
|
|
2
2
|
export class TranslateCombinedLoader {
|
|
3
3
|
constructor(...loaders) {
|
|
4
4
|
this._loaders = loaders;
|
|
5
5
|
}
|
|
6
6
|
getTranslation(lang) {
|
|
7
|
-
return forkJoin(this._loaders.map((l) => l.getTranslation(lang)
|
|
7
|
+
return forkJoin(this._loaders.map((l) => l.getTranslation(lang).pipe(catchError(err => {
|
|
8
|
+
console.error('Failed to load translation file', l, err);
|
|
9
|
+
return of({});
|
|
10
|
+
})))).pipe(map((allTranslations) => {
|
|
8
11
|
let result = {};
|
|
9
12
|
allTranslations.forEach((translations) => {
|
|
10
13
|
result = this.mergeDeep(result, translations);
|
|
@@ -33,4 +36,4 @@ export class TranslateCombinedLoader {
|
|
|
33
36
|
return output;
|
|
34
37
|
}
|
|
35
38
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNsYXRlLmNvbWJpbmVkLmxvYWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvYW5ndWxhci1hY2NlbGVyYXRvci9zcmMvbGliL3V0aWxzL3RyYW5zbGF0ZS5jb21iaW5lZC5sb2FkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFjLFVBQVUsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQTtBQUNoRSxNQUFNLE9BQU8sdUJBQXVCO0lBRWxDLFlBQVksR0FBRyxPQUEwQjtRQUN2QyxJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQTtJQUN6QixDQUFDO0lBQ0QsY0FBYyxDQUFDLElBQVk7UUFDekIsT0FBTyxRQUFRLENBQ2IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUN0QixDQUFDLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FDekIsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ2YsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQ0FBaUMsRUFBRSxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUE7WUFDeEQsT0FBTyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDZixDQUFDLENBQUMsQ0FDSCxDQUNGLENBQ0YsQ0FBQyxJQUFJLENBQ0osR0FBRyxDQUFDLENBQUMsZUFBZSxFQUFFLEVBQUU7WUFDdEIsSUFBSSxNQUFNLEdBQUcsRUFBRSxDQUFBO1lBQ2YsZUFBZSxDQUFDLE9BQU8sQ0FBQyxDQUFDLFlBQVksRUFBRSxFQUFFO2dCQUN2QyxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsWUFBWSxDQUFDLENBQUE7WUFDL0MsQ0FBQyxDQUFDLENBQUE7WUFDRixPQUFPLE1BQU0sQ0FBQTtRQUNmLENBQUMsQ0FBQyxDQUNILENBQUE7SUFDSCxDQUFDO0lBQ0QsUUFBUSxDQUFDLElBQVM7UUFDaEIsT0FBTyxJQUFJLElBQUksT0FBTyxJQUFJLEtBQUssUUFBUSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNqRSxDQUFDO0lBRUQsU0FBUyxDQUFDLE1BQVcsRUFBRSxNQUFXO1FBQ2hDLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQ3hDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7WUFDbkQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDbEMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUM7b0JBQy9CLElBQUksQ0FBQyxDQUFDLEdBQUcsSUFBSSxNQUFNLENBQUM7d0JBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7O3dCQUM5RCxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUE7Z0JBQzdELENBQUM7cUJBQU0sQ0FBQztvQkFDTixNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtnQkFDL0MsQ0FBQztZQUNILENBQUMsQ0FBQyxDQUFBO1FBQ0osQ0FBQztRQUNELE9BQU8sTUFBTSxDQUFBO0lBQ2YsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJhbnNsYXRlTG9hZGVyIH0gZnJvbSAnQG5neC10cmFuc2xhdGUvY29yZSdcbmltcG9ydCB7IE9ic2VydmFibGUsIGNhdGNoRXJyb3IsIGZvcmtKb2luLCBtYXAsIG9mIH0gZnJvbSAncnhqcydcbmV4cG9ydCBjbGFzcyBUcmFuc2xhdGVDb21iaW5lZExvYWRlciBpbXBsZW1lbnRzIFRyYW5zbGF0ZUxvYWRlciB7XG4gIHByaXZhdGUgX2xvYWRlcnM6IFRyYW5zbGF0ZUxvYWRlcltdXG4gIGNvbnN0cnVjdG9yKC4uLmxvYWRlcnM6IFRyYW5zbGF0ZUxvYWRlcltdKSB7XG4gICAgdGhpcy5fbG9hZGVycyA9IGxvYWRlcnNcbiAgfVxuICBnZXRUcmFuc2xhdGlvbihsYW5nOiBzdHJpbmcpOiBPYnNlcnZhYmxlPG9iamVjdD4ge1xuICAgIHJldHVybiBmb3JrSm9pbihcbiAgICAgIHRoaXMuX2xvYWRlcnMubWFwKChsKSA9PlxuICAgICAgICBsLmdldFRyYW5zbGF0aW9uKGxhbmcpLnBpcGUoXG4gICAgICAgICAgY2F0Y2hFcnJvcihlcnIgPT4ge1xuICAgICAgICAgICAgY29uc29sZS5lcnJvcignRmFpbGVkIHRvIGxvYWQgdHJhbnNsYXRpb24gZmlsZScsIGwsIGVycilcbiAgICAgICAgICAgIHJldHVybiBvZih7fSlcbiAgICAgICAgICB9KVxuICAgICAgICApXG4gICAgICApXG4gICAgKS5waXBlKFxuICAgICAgbWFwKChhbGxUcmFuc2xhdGlvbnMpID0+IHtcbiAgICAgICAgbGV0IHJlc3VsdCA9IHt9XG4gICAgICAgIGFsbFRyYW5zbGF0aW9ucy5mb3JFYWNoKCh0cmFuc2xhdGlvbnMpID0+IHtcbiAgICAgICAgICByZXN1bHQgPSB0aGlzLm1lcmdlRGVlcChyZXN1bHQsIHRyYW5zbGF0aW9ucylcbiAgICAgICAgfSlcbiAgICAgICAgcmV0dXJuIHJlc3VsdFxuICAgICAgfSlcbiAgICApXG4gIH1cbiAgaXNPYmplY3QoaXRlbTogYW55KTogYW55IHtcbiAgICByZXR1cm4gaXRlbSAmJiB0eXBlb2YgaXRlbSA9PT0gJ29iamVjdCcgJiYgIUFycmF5LmlzQXJyYXkoaXRlbSlcbiAgfVxuXG4gIG1lcmdlRGVlcCh0YXJnZXQ6IGFueSwgc291cmNlOiBhbnkpOiBhbnkge1xuICAgIGNvbnN0IG91dHB1dCA9IE9iamVjdC5hc3NpZ24oe30sIHRhcmdldClcbiAgICBpZiAodGhpcy5pc09iamVjdCh0YXJnZXQpICYmIHRoaXMuaXNPYmplY3Qoc291cmNlKSkge1xuICAgICAgT2JqZWN0LmtleXMoc291cmNlKS5mb3JFYWNoKChrZXkpID0+IHtcbiAgICAgICAgaWYgKHRoaXMuaXNPYmplY3Qoc291cmNlW2tleV0pKSB7XG4gICAgICAgICAgaWYgKCEoa2V5IGluIHRhcmdldCkpIE9iamVjdC5hc3NpZ24ob3V0cHV0LCB7IFtrZXldOiBzb3VyY2Vba2V5XSB9KVxuICAgICAgICAgIGVsc2Ugb3V0cHV0W2tleV0gPSB0aGlzLm1lcmdlRGVlcCh0YXJnZXRba2V5XSwgc291cmNlW2tleV0pXG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgT2JqZWN0LmFzc2lnbihvdXRwdXQsIHsgW2tleV06IHNvdXJjZVtrZXldIH0pXG4gICAgICAgIH1cbiAgICAgIH0pXG4gICAgfVxuICAgIHJldHVybiBvdXRwdXRcbiAgfVxufVxuIl19
|
|
@@ -15,7 +15,7 @@ import * as i1$1 from '@ngx-translate/core';
|
|
|
15
15
|
import { TranslateService, TranslatePipe, TranslateModule } from '@ngx-translate/core';
|
|
16
16
|
import * as i1$3 from 'primeng/api';
|
|
17
17
|
import { PrimeIcons, PrimeTemplate, SharedModule } from 'primeng/api';
|
|
18
|
-
import { BehaviorSubject, map, filter, concat, of, combineLatest, mergeMap, first, debounceTime, withLatestFrom, ReplaySubject, startWith, timestamp, tap, firstValueFrom, skip, defaultIfEmpty, forkJoin } from 'rxjs';
|
|
18
|
+
import { BehaviorSubject, map, filter, concat, of, combineLatest, mergeMap, first, debounceTime, withLatestFrom, ReplaySubject, startWith, timestamp, tap, firstValueFrom, skip, defaultIfEmpty, forkJoin, catchError } from 'rxjs';
|
|
19
19
|
import { __decorate, __metadata } from 'tslib';
|
|
20
20
|
import * as i1$2 from '@angular/router';
|
|
21
21
|
import { NavigationEnd, Router, ActivatedRoute, RouterModule } from '@angular/router';
|
|
@@ -4744,7 +4744,10 @@ class TranslateCombinedLoader {
|
|
|
4744
4744
|
this._loaders = loaders;
|
|
4745
4745
|
}
|
|
4746
4746
|
getTranslation(lang) {
|
|
4747
|
-
return forkJoin(this._loaders.map((l) => l.getTranslation(lang)
|
|
4747
|
+
return forkJoin(this._loaders.map((l) => l.getTranslation(lang).pipe(catchError(err => {
|
|
4748
|
+
console.error('Failed to load translation file', l, err);
|
|
4749
|
+
return of({});
|
|
4750
|
+
})))).pipe(map((allTranslations) => {
|
|
4748
4751
|
let result = {};
|
|
4749
4752
|
allTranslations.forEach((translations) => {
|
|
4750
4753
|
result = this.mergeDeep(result, translations);
|