From 402360b436f0f01a520a47ed0c21b99d75105c5a Mon Sep 17 00:00:00 2001
From: garronej <joseph.garrone@protonmail.com>
Date: Thu, 13 Mar 2025 21:55:55 +0100
Subject: [PATCH]  #814 https://github.com/keycloak/keycloak/issues/38029

---
 src/login/UserProfileFormFields.tsx |  5 ++++-
 src/login/i18n/noJsx/getI18n.tsx    | 19 -------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/login/UserProfileFormFields.tsx b/src/login/UserProfileFormFields.tsx
index 53841597..e7ea747a 100644
--- a/src/login/UserProfileFormFields.tsx
+++ b/src/login/UserProfileFormFields.tsx
@@ -90,7 +90,6 @@ export default function UserProfileFormFields(props: UserProfileFormFieldsProps<
                                         {advancedMsg(attribute.annotations.inputHelperTextAfter)}
                                     </div>
                                 )}
-
                                 {AfterField !== undefined && (
                                     <AfterField
                                         attribute={attribute}
@@ -107,6 +106,10 @@ export default function UserProfileFormFields(props: UserProfileFormFieldsProps<
                     </Fragment>
                 );
             })}
+            {/* See: https://github.com/keycloak/keycloak/issues/38029 */}
+            {kcContext.locale !== undefined && formFieldStates.find(x => x.attribute.name === "locale") === undefined && (
+                <input type="hidden" name="locale" value={i18n.currentLanguage.languageTag} />
+            )}
         </>
     );
 }
diff --git a/src/login/i18n/noJsx/getI18n.tsx b/src/login/i18n/noJsx/getI18n.tsx
index 23b96dae..2c310776 100644
--- a/src/login/i18n/noJsx/getI18n.tsx
+++ b/src/login/i18n/noJsx/getI18n.tsx
@@ -217,25 +217,6 @@ export function createGetI18n<
             return enabledLanguages;
         })();
 
-        // See: https://github.com/keycloak/keycloak/issues/38029
-        patch_keycloak_issue_38029: {
-            const enabledLanguage_current = enabledLanguages.find(({ languageTag }) => languageTag === currentLanguage.languageTag);
-
-            assert(enabledLanguage_current !== undefined);
-
-            if (!enabledLanguage_current.href.includes("kc_locale=")) {
-                // NOTE: Probably a mock
-                break patch_keycloak_issue_38029;
-            }
-
-            // NOTE: Best effort, we don't wait for it to be done
-            // and we don't handle errors
-            fetch(enabledLanguage_current.href).then(
-                () => {},
-                () => {}
-            );
-        }
-
         const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey_themeDefined>({
             themeName: kcContext.themeName,
             messages_themeDefined: