From 4325518917c7367ce6fddc8ba5a519cead7adf63 Mon Sep 17 00:00:00 2001 From: Pavel Maskevich Date: Sat, 21 Sep 2024 21:11:36 +0200 Subject: [PATCH] issue-20805 fixed bug with wrong lang attribute --- .../src/lib/services/session-state.service.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git 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 index 36f7c9e94a..7d73c5c4ed 100644 --- 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 @@ -47,9 +47,8 @@ export class SessionStateService { if (lang.includes(';')) { lang = lang.split(';')[0]; } - if (appLanguage !== lang) { - this.setLanguage(lang); - } + + this.setLanguage(lang); }); } @@ -84,9 +83,15 @@ export class SessionStateService { } setLanguage(language: string) { - if (language === this.store.state.language) return; + const currentLanguage = this.store.state.language; + + if (language !== currentLanguage) { + this.store.patch({ language }); + } - this.store.patch({ language }); - document.documentElement.setAttribute('lang', language); + const currentAttribute = document.documentElement.getAttribute('lang'); + if (language !== currentAttribute) { + document.documentElement.setAttribute('lang', language); + } } }