Merge branch 'develop' into 'main'

AW-483-484-485-fix-bugs

See merge request witapp/aura-webapp!803

src/locales/index.ts

@@ -46,7 +46,12 @@ export let language: string = fallbackLng;
 export const setLanguage = async () => {
   let _language = await getClientLocale();
 
-  if (
+  // Normalize English variants to 'en'
+  if (_language?.toLowerCase().startsWith('en')) {
+    _language = 'en';
+  }
+  // Handle Spanish variants
+  else if (
     (_language?.toLowerCase().match(/es/g) || []).length === 1 &&
     _language?.toLowerCase() !== "es"
   ) {