Browse Source
Merge pull request #14952 from abpframework/fix/language-conflict
fix initial language conflict
pull/14953/head
Mahmut Gundogdu
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
3 deletions
-
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); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|