From 40ebbdebebfc2c4f9276c38891c6a33fd3b2d249 Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Sat, 21 Sep 2024 04:45:00 +0200 Subject: [PATCH] Fix some type errors --- src/login/i18n/index.ts | 3 ++- src/login/i18n/pinApi.ts | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/login/i18n/index.ts b/src/login/i18n/index.ts index 1d21e21d..2431dc91 100644 --- a/src/login/i18n/index.ts +++ b/src/login/i18n/index.ts @@ -1,5 +1,6 @@ import type { GenericI18n } from "./GenericI18n"; +import type { LanguageTag } from "./messages_defaultSet/LanguageTag"; import type { MessageKey_defaultSet, KcContextLike } from "./i18n"; export type { MessageKey_defaultSet, KcContextLike }; -export type I18n = GenericI18n; +export type I18n = GenericI18n; export { createUseI18n, i18nApi } from "./useI18n"; diff --git a/src/login/i18n/pinApi.ts b/src/login/i18n/pinApi.ts index 8db3a2d4..2ba8aaba 100644 --- a/src/login/i18n/pinApi.ts +++ b/src/login/i18n/pinApi.ts @@ -24,9 +24,9 @@ export type I18nInitializer< withExtraLanguages: < LanguageTag_notInDefaultSet extends string >(extraLanguageTranslations: { - [LanguageTag in LanguageTag_notInDefaultSet]: () => Promise< - Record - >; + [LanguageTag in LanguageTag_notInDefaultSet]: () => Promise<{ + default: Record; + }>; }) => I18nInitializer< ThemeName, MessageKey_themeDefined, @@ -62,9 +62,9 @@ function createI18nInitializer< LanguageTag_notInDefaultSet extends string = never >(params: { extraLanguageTranslations: { - [LanguageTag in LanguageTag_notInDefaultSet]: () => Promise< - Record - >; + [LanguageTag in LanguageTag_notInDefaultSet]: () => Promise<{ + default: Record; + }>; }; messagesByLanguageTag_themeDefined: Partial<{ [LanguageTag in LanguageTag_defaultSet | LanguageTag_notInDefaultSet]: Record< @@ -106,8 +106,12 @@ function createI18nInitializer< return i18nInitializer; } -export const i18nInitializer = createI18nInitializer({}); +export const i18nInitializer = createI18nInitializer({ + extraLanguageTranslations: {}, + messagesByLanguageTag_themeDefined: {} +}); +/* const i18n = i18nInitializer .withThemeName<"my-theme-1" | "my-theme-2">() .withExtraLanguages({ @@ -128,3 +132,4 @@ const i18n = i18nInitializer } }) .create(); +*/