On logout, the default locale of the application should override the …

…user's locale
openmrs · Oct 6, 2023 · ffb6690 · ffb6690
1 parent 82616de
commit ffb6690
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/packages/apps/esm-login-app/src/redirect-logout/redirect-logout.component.tsx b/packages/apps/esm-login-app/src/redirect-logout/redirect-logout.component.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect } from "react";
 import {
   navigate,
+  setUserLanguage,
   useConfig,
   useConnectivity,
   useSession,
@@ -19,6 +20,13 @@ const RedirectLogout: React.FC<RedirectLogoutProps> = () => {
       navigate({ to: "${openmrsSpaBase}/login" });
     } else {
       performLogout().then(() => {
+        const defaultLang =
+          document.documentElement.getAttribute("defaultLang");
+        setUserLanguage({
+          locale: defaultLang,
+          authenticated: false,
+          sessionId: "",
+        });
         if (config.provider.type === "oauth2") {
           navigate({ to: config.provider.logoutUrl });
         } else {

diff --git a/packages/framework/esm-api/src/shared-api-objects/current-user.ts b/packages/framework/esm-api/src/shared-api-objects/current-user.ts
@@ -128,7 +128,7 @@ function isValidLocale(locale: unknown): locale is string {
   return true;
 }
 
-function setUserLanguage(data: Session) {
+export function setUserLanguage(data: Session) {
   const locale = data?.user?.userProperties?.defaultLocale ?? data.locale;
   const htmlLang = document.documentElement.getAttribute("lang");
 

diff --git a/packages/shell/esm-app-shell/src/index.ejs b/packages/shell/esm-app-shell/src/index.ejs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= openmrsDefaultLocale %>">
+<html lang="<%= openmrsDefaultLocale %>" defaultLang="<%= openmrsDefaultLocale %>">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">