From 66a314409d03cc00c46bd13ebc73cbad0f25d8d7 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 25 Sep 2020 11:58:47 +0300 Subject: [PATCH] fix: set current lang to session state instead of default language --- .../packages/core/src/lib/states/config.state.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/states/config.state.ts b/npm/ng-packs/packages/core/src/lib/states/config.state.ts index 8639981456..4e686dbe62 100644 --- a/npm/ng-packs/packages/core/src/lib/states/config.state.ts +++ b/npm/ng-packs/packages/core/src/lib/states/config.state.ts @@ -218,20 +218,17 @@ export class ConfigState { }), ), switchMap(configuration => { - let defaultLang: string = - configuration.setting.values['Abp.Localization.DefaultLanguage']; + let lang = configuration.localization.currentCulture.cultureName; - if (defaultLang.includes(';')) { - defaultLang = defaultLang.split(';')[0]; + if (lang.includes(';')) { + lang = lang.split(';')[0]; } - document.documentElement.setAttribute( - 'lang', - configuration.localization.currentCulture.cultureName, - ); + document.documentElement.setAttribute('lang', lang); + return this.store.selectSnapshot(SessionState.getLanguage) ? of(null) - : dispatch(new SetLanguage(defaultLang, false)); + : dispatch(new SetLanguage(lang, false)); }), catchError((err: HttpErrorResponse) => { dispatch(new RestOccurError(err));