From 4c94c54cee80bd431919e7a64ca2cbd66e7610ec Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 3 Nov 2020 15:22:51 +0300 Subject: [PATCH] feat: get registerLocaleFn from core options --- .../core/src/lib/services/localization.service.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts index c6ebb3dd00..c54c922b87 100644 --- a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts @@ -4,11 +4,11 @@ import { Actions, ofActionSuccessful, Store } from '@ngxs/store'; import { noop, Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { SetLanguage } from '../actions/session.actions'; +import { ABP } from '../models/common'; import { Config } from '../models/config'; import { ConfigState } from '../states/config.state'; -import { registerLocale } from '../utils/initial-utils'; -import { createLocalizer, createLocalizerWithFallback } from '../utils/localization-utils'; import { CORE_OPTIONS } from '../tokens/options.token'; +import { createLocalizer, createLocalizerWithFallback } from '../utils/localization-utils'; type ShouldReuseRoute = (future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot) => boolean; @@ -52,7 +52,9 @@ export class LocalizationService { router.routeReuseStrategy.shouldReuseRoute = () => false; router.navigated = false; - return registerLocale(locale, this.injector).then(() => { + const { registerLocaleFn }: ABP.Root = this.injector.get(CORE_OPTIONS); + + return registerLocaleFn(locale, this.injector).then(() => { this.ngZone.run(async () => { await router.navigateByUrl(router.url).catch(noop); router.routeReuseStrategy.shouldReuseRoute = shouldReuseRoute;