From 5800102f9ff24ae3eab4bf64a8fd4f664714fc99 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Thu, 26 Jan 2023 00:06:16 +0300
Subject: [PATCH 1/2] Fix language change when refreshing

---
 src/index.jsx            | 9 ---------
 src/scripts/globalize.js | 2 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/index.jsx b/src/index.jsx
index ef3feeb7e9..2d121b2620 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -227,15 +227,8 @@ async function onAppReady() {
             }
         };
 
-        const handleLanguageChange = () => {
-            const locale = globalize.getCurrentLocale();
-
-            document.documentElement.setAttribute('lang', locale);
-        };
-
         const handleUserChange = () => {
             handleStyleChange();
-            handleLanguageChange();
         };
 
         Events.on(ServerConnections, 'localusersignedin', handleUserChange);
@@ -243,8 +236,6 @@ async function onAppReady() {
         Events.on(currentSettings, 'change', (e, prop) => {
             if (prop == 'disableCustomCss' || prop == 'customCss') {
                 handleStyleChange();
-            } else if (prop == 'language') {
-                handleLanguageChange();
             }
         });
 
diff --git a/src/scripts/globalize.js b/src/scripts/globalize.js
index d95da559c6..b0edd538c2 100644
--- a/src/scripts/globalize.js
+++ b/src/scripts/globalize.js
@@ -89,6 +89,8 @@ const Direction = {
 
         currentCulture = normalizeLocaleName(culture);
 
+        document.documentElement.setAttribute('lang', currentCulture);
+
         let dateTimeCulture;
         try {
             dateTimeCulture = userSettings.dateTimeLocale();

From e0d388a38571ef1128612d9063b39eb2e59dae3b Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Thu, 26 Jan 2023 00:08:41 +0300
Subject: [PATCH 2/2] Update language when logging out

---
 src/index.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.jsx b/src/index.jsx
index 2d121b2620..b9a4d9603e 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -74,6 +74,7 @@ function init() {
         autoFocuser.enable();
 
         Events.on(ServerConnections, 'localusersignedin', globalize.updateCurrentCulture);
+        Events.on(ServerConnections, 'localusersignedout', globalize.updateCurrentCulture);
     });
 }