fix initial language conflict

4 years ago · 71d330bf0d
1 changed files with 4 additions and 3 deletions
--- a/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts
@ -31,7 +31,7 @@ export class SessionStateService {
  }

  private setInitialLanguage() {
-    if (this.getLanguage()) return;
+    const appLanguage = this.getLanguage();

    this.configState
      .getDeep$('localization.currentCulture.cultureName')
@ -43,8 +43,9 @@ export class SessionStateService {
        if (lang.includes(';')) {
          lang = lang.split(';')[0];
        }
-
-        this.setLanguage(lang);
+        if (appLanguage !== lang) {
+          this.setLanguage(lang);
+        }
      });
  }