agtic/keycloak_theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #549 after test

Browse Source
This commit is contained in:
Joseph Garrone 2024-05-28 00:23:48 +02:00
parent c3ee8e10e6
commit 56d6d8001a
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
View File

@ -193,7 +193,7 @@ function decodeHtmlEntities(htmlStr){
decodeHtmlEntities.element = element;
}
element.innerHTML = htmlStr;
return textarea.value;
return element.value;
}
})();

6
src/login/i18n/i18n.tsx
View File

@ -12,7 +12,7 @@ export type KcContextLike = {
currentLanguageTag: string;
supported: { languageTag: string; url: string; label: string }[];
};
__localizationRealmOverridesUserProfile: Record<string, string>;
__localizationRealmOverridesUserProfile?: Record<string, string>;
};
assert<KcContext extends KcContextLike ? true : false>();
@ -145,7 +145,7 @@ export function createUseI18n<ExtraMessageKey extends string = never>(extraMessa
function createI18nTranslationFunctions<MessageKey extends string>(params: {
fallbackMessages: Record<MessageKey, string>;
messages: Record<MessageKey, string>;
__localizationRealmOverridesUserProfile: Record<string, string>;
__localizationRealmOverridesUserProfile: Record<string, string> | undefined;
}): Pick<GenericI18n<MessageKey>, "msg" | "msgStr" | "advancedMsg" | "advancedMsgStr"> {
const { fallbackMessages, messages, __localizationRealmOverridesUserProfile } = params;
@ -203,7 +203,7 @@ function createI18nTranslationFunctions<MessageKey extends string>(params: {
function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): JSX.Element | string {
const { key, args, doRenderAsHtml } = props;
if (key in __localizationRealmOverridesUserProfile) {
if (__localizationRealmOverridesUserProfile !== undefined && key in __localizationRealmOverridesUserProfile) {
const resolvedMessage = __localizationRealmOverridesUserProfile[key];
return doRenderAsHtml ? (

7
src/login/kcContext/KcContext.ts
View File

@ -144,7 +144,7 @@ export declare namespace KcContext {
tabId: string;
ssoLoginInOtherTabsUrl: string;
};
__localizationRealmOverridesUserProfile: Record<string, string>;
__localizationRealmOverridesUserProfile?: Record<string, string>;
};
export type SamlPostForm = Common & {
@ -757,9 +757,8 @@ export type PasswordPolicies = {
};
assert<
KcContext.Common extends Record<
typeof nameOfTheLocalizationRealmOverridesUserProfileProperty,
unknown
KcContext.Common extends Partial<
Record<typeof nameOfTheLocalizationRealmOverridesUserProfileProperty, unknown>
>
? true
: false