From 3706f15f7e6a8b99c34091949fb0eaeab68dbfb7 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Fri, 28 Jun 2024 06:46:12 +0200
Subject: [PATCH] Fix bug resolving user profile translations

---
 src/login/i18n/i18n.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/login/i18n/i18n.tsx b/src/login/i18n/i18n.tsx
index cf4d18e9..29d85aa2 100644
--- a/src/login/i18n/i18n.tsx
+++ b/src/login/i18n/i18n.tsx
@@ -259,8 +259,16 @@ function createI18nTranslationFunctionsFactory<MessageKey extends string, ExtraM
         function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): JSX.Element | string {
             const { key, args, doRenderAsHtml } = props;
 
-            if (realmMessageBundleUserProfile !== undefined && key in realmMessageBundleUserProfile) {
-                const resolvedMessage = realmMessageBundleUserProfile[key];
+            user_profile: {
+                if (realmMessageBundleUserProfile === undefined) {
+                    break user_profile;
+                }
+
+                const resolvedMessage = realmMessageBundleUserProfile[key] ?? realmMessageBundleUserProfile["${" + key + "}"];
+
+                if (resolvedMessage === undefined) {
+                    break user_profile;
+                }
 
                 return doRenderAsHtml ? (
                     <span