From a324ba367a75fc790f9456e479e7bbf22abe00aa Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 24 Jan 2024 17:48:00 -0300 Subject: fixes #8265 --- packages/web-util/src/components/LangSelector.tsx | 4 ++-- packages/web-util/src/context/translation.ts | 26 +++++++++++----------- .../src/forms/InputChoiceHorizontal.stories.tsx | 2 +- .../src/forms/InputChoiceStacked.stories.tsx | 2 +- packages/web-util/src/hooks/useLang.ts | 10 ++++----- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'packages/web-util/src') diff --git a/packages/web-util/src/components/LangSelector.tsx b/packages/web-util/src/components/LangSelector.tsx index 7deaa0cf4..8e5a82f75 100644 --- a/packages/web-util/src/components/LangSelector.tsx +++ b/packages/web-util/src/components/LangSelector.tsx @@ -45,7 +45,7 @@ function getLangName(s: keyof LangsNames | string): string { export function LangSelector({ }: {}): VNode { const [updatingLang, setUpdatingLang] = useState(false); - const { lang, changeLanguage, completness, supportedLang } = useTranslationContext(); + const { lang, changeLanguage, completeness, supportedLang } = useTranslationContext(); const [hidden, setHidden] = useState(true); useEffect(() => { @@ -95,7 +95,7 @@ export function LangSelector({ }: {}): VNode { > {getLangName(lang)} - {(completness as any)[lang]}% + {(completeness as any)[lang]}% diff --git a/packages/web-util/src/context/translation.ts b/packages/web-util/src/context/translation.ts index 2b9704939..5b7707d14 100644 --- a/packages/web-util/src/context/translation.ts +++ b/packages/web-util/src/context/translation.ts @@ -34,7 +34,7 @@ interface Type { changeLanguage: (l: string) => void; i18n: InternationalizationAPI; dateLocale: Locale, - completness: { [id in keyof typeof supportedLang]: number } + completeness: { [id in keyof typeof supportedLang]: number } } const supportedLang = { @@ -54,7 +54,7 @@ const initial: Type = { }, i18n, dateLocale: enLocale, - completness: { + completeness: { de: 0, en: 0, es: 0, @@ -70,7 +70,7 @@ interface Props { children: ComponentChildren; forceLang?: string; source: Record; - completness?: Record; + completeness?: Record; } // Outmost UI wrapper. @@ -79,17 +79,17 @@ export const TranslationProvider = ({ children, forceLang, source, - completness: completnessProp + completeness: completenessProp }: Props): VNode => { - const completness = { - de: !completnessProp || !completnessProp["de"] ? 0 : completnessProp["de"], - en: !completnessProp || !completnessProp["en"] ? 0 : completnessProp["en"], - es: !completnessProp || !completnessProp["es"] ? 0 : completnessProp["es"], - fr: !completnessProp || !completnessProp["fr"] ? 0 : completnessProp["fr"], - it: !completnessProp || !completnessProp["it"] ? 0 : completnessProp["it"], - sv: !completnessProp || !completnessProp["sv"] ? 0 : completnessProp["sv"], + const completeness = { + de: !completenessProp || !completenessProp["de"] ? 0 : completenessProp["de"], + en: !completenessProp || !completenessProp["en"] ? 0 : completenessProp["en"], + es: !completenessProp || !completenessProp["es"] ? 0 : completenessProp["es"], + fr: !completenessProp || !completenessProp["fr"] ? 0 : completenessProp["fr"], + it: !completenessProp || !completenessProp["it"] ? 0 : completenessProp["it"], + sv: !completenessProp || !completenessProp["sv"] ? 0 : completenessProp["sv"], } - const { value: lang, update: changeLanguage } = useLang(initial, completness); + const { value: lang, update: changeLanguage } = useLang(initial, completeness); useEffect(() => { if (forceLang) { @@ -111,7 +111,7 @@ export const TranslationProvider = ({ enLocale; return h(Context.Provider, { - value: { lang, changeLanguage, supportedLang, i18n, dateLocale, completness }, + value: { lang, changeLanguage, supportedLang, i18n, dateLocale, completeness }, children, }); }; diff --git a/packages/web-util/src/forms/InputChoiceHorizontal.stories.tsx b/packages/web-util/src/forms/InputChoiceHorizontal.stories.tsx index 2907a4dab..b950d3d02 100644 --- a/packages/web-util/src/forms/InputChoiceHorizontal.stories.tsx +++ b/packages/web-util/src/forms/InputChoiceHorizontal.stories.tsx @@ -58,7 +58,7 @@ const form: FlexibleForm = { label: "second choice" as TranslatedString, value: "2" }, { - label: "thrid choice" as TranslatedString, + label: "third choice" as TranslatedString, value: "3" },], }, diff --git a/packages/web-util/src/forms/InputChoiceStacked.stories.tsx b/packages/web-util/src/forms/InputChoiceStacked.stories.tsx index 54228934e..ed5170d17 100644 --- a/packages/web-util/src/forms/InputChoiceStacked.stories.tsx +++ b/packages/web-util/src/forms/InputChoiceStacked.stories.tsx @@ -58,7 +58,7 @@ const form: FlexibleForm = { label: "second choice" as TranslatedString, value: "2" }, { - label: "thrid choice" as TranslatedString, + label: "third choice" as TranslatedString, value: "3" },], }, diff --git a/packages/web-util/src/hooks/useLang.ts b/packages/web-util/src/hooks/useLang.ts index e4e512388..5b1be0309 100644 --- a/packages/web-util/src/hooks/useLang.ts +++ b/packages/web-util/src/hooks/useLang.ts @@ -25,16 +25,16 @@ const MIN_LANG_COVERAGE_THRESHOLD = 90; * choose the best from the browser config based on the completeness * on the translation */ -function getBrowserLang(completness: Record): string | undefined { +function getBrowserLang(completeness: Record): string | undefined { if (typeof window === "undefined") return undefined; if (window.navigator.language) { - if (completness[window.navigator.language] >= MIN_LANG_COVERAGE_THRESHOLD) { + if (completeness[window.navigator.language] >= MIN_LANG_COVERAGE_THRESHOLD) { return window.navigator.language } } if (window.navigator.languages) { - const match = Object.entries(completness).filter(([code, value]) => { + const match = Object.entries(completeness).filter(([code, value]) => { if (value < MIN_LANG_COVERAGE_THRESHOLD) return false; //do not consider langs below 90% return window.navigator.languages.findIndex(l => l.startsWith(code)) !== -1 }).map(([code, value]) => ({ code, value })) @@ -55,7 +55,7 @@ function getBrowserLang(completness: Record): string | undefined const langPreferenceKey = buildStorageKey("lang-preference"); -export function useLang(initial: string | undefined, completness: Record): Required { - const defaultValue = (getBrowserLang(completness) || initial || "en").substring(0, 2); +export function useLang(initial: string | undefined, completeness: Record): Required { + const defaultValue = (getBrowserLang(completeness) || initial || "en").substring(0, 2); return useLocalStorage(langPreferenceKey, defaultValue); } -- cgit v1.2.3