From d22ba8a91967836538cac8436503197286841ce7 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Wed, 13 May 2020 20:44:16 +0300
Subject: [PATCH] fix(core): set language when call app config api

---
 .../packages/core/src/lib/actions/session.actions.ts       | 2 +-
 .../packages/core/src/lib/services/localization.service.ts | 7 +++----
 npm/ng-packs/packages/core/src/lib/states/config.state.ts  | 6 +++++-
 npm/ng-packs/packages/core/src/lib/states/session.state.ts | 7 +++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts
index 463e9a202d..a7d2cd9f3c 100644
--- a/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts
+++ b/npm/ng-packs/packages/core/src/lib/actions/session.actions.ts
@@ -2,7 +2,7 @@ import { ABP } from '../models';
 
 export class SetLanguage {
   static readonly type = '[Session] Set Language';
-  constructor(public payload: string) {}
+  constructor(public payload: string, public dispatchAppConfiguration?: boolean) {}
 }
 export class SetTenant {
   static readonly type = '[Session] Set Tenant';
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 a3b452de11..0e89732e56 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
@@ -33,10 +33,9 @@ export class LocalizationService {
   }
 
   private listenToSetLanguage() {
-    this.actions.pipe(ofActionSuccessful(SetLanguage)).subscribe(({ payload }) => {
-      this.registerLocale(payload);
-      document.documentElement.lang = payload;
-    });
+    this.actions
+      .pipe(ofActionSuccessful(SetLanguage))
+      .subscribe(({ payload }) => this.registerLocale(payload));
   }
 
   setRouteReuse(reuse: ShouldReuseRoute) {
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 546b3d0b1e..29535be0ab 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
@@ -219,9 +219,13 @@ export class ConfigState {
             defaultLang = defaultLang.split(';')[0];
           }
 
+          document.documentElement.setAttribute(
+            'lang',
+            configuration.localization.currentCulture.cultureName,
+          );
           return this.store.selectSnapshot(SessionState.getLanguage)
             ? of(null)
-            : dispatch(new SetLanguage(defaultLang));
+            : dispatch(new SetLanguage(defaultLang, false));
         }),
         catchError(err => {
           dispatch(new RestOccurError(new HttpErrorResponse({ status: 0, error: err })));
diff --git a/npm/ng-packs/packages/core/src/lib/states/session.state.ts b/npm/ng-packs/packages/core/src/lib/states/session.state.ts
index 6acbf1d60d..0c81a46c58 100644
--- a/npm/ng-packs/packages/core/src/lib/states/session.state.ts
+++ b/npm/ng-packs/packages/core/src/lib/states/session.state.ts
@@ -69,12 +69,15 @@ export class SessionState {
   }
 
   @Action(SetLanguage)
-  setLanguage({ patchState, dispatch }: StateContext<Session.State>, { payload }: SetLanguage) {
+  setLanguage(
+    { patchState, dispatch }: StateContext<Session.State>,
+    { payload, dispatchAppConfiguration = true }: SetLanguage,
+  ) {
     patchState({
       language: payload,
     });
 
-    return dispatch(new GetAppConfiguration());
+    if (dispatchAppConfiguration) return dispatch(new GetAppConfiguration());
   }
 
   @Action(SetTenant)