Accords-Library-Archive
/
accords-library.com
1
0
Fork 0
Code Issues Pull Requests 5 Packages Projects Releases Wiki Activity

Fixes for languages

This commit is contained in:
DrMint 2023-06-08 18:35:33 +02:00
parent 62e64b9319
commit 3c7b9aa2d6
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/contexts/settings.ts
View File

@ -2,7 +2,7 @@ import { useRouter } from "next/router";
import { useEffect } from "react"; import { useEffect } from "react";
import { atom } from "jotai"; import { atom } from "jotai";
import { atomWithStorage } from "jotai/utils"; import { atomWithStorage } from "jotai/utils";
import { atomPairing, useAtomGetter, useAtomPair, useAtomSetter } from "helpers/atoms"; import { atomPairing, useAtomGetter, useAtomPair } from "helpers/atoms";
import { isDefined } from "helpers/asserts"; import { isDefined } from "helpers/asserts";
import { usePrefersDarkMode } from "hooks/useMediaQuery"; import { usePrefersDarkMode } from "hooks/useMediaQuery";
import { userAgent } from "contexts/userAgent"; import { userAgent } from "contexts/userAgent";
@ -69,7 +69,7 @@ export const settings = {
export const useSettings = (): void => { export const useSettings = (): void => {
const router = useRouter(); const router = useRouter();
const setPreferredLanguages = useAtomSetter(preferredLanguagesAtom); const [preferredLanguages, setPreferredLanguages] = useAtomPair(preferredLanguagesAtom);
const fontSize = useAtomGetter(fontSizeAtom); const fontSize = useAtomGetter(fontSizeAtom);
const isDyslexic = useAtomGetter(dyslexicAtom); const isDyslexic = useAtomGetter(dyslexicAtom);
const [isDarkMode, setDarkMode] = useAtomPair(darkModeAtom); const [isDarkMode, setDarkMode] = useAtomPair(darkModeAtom);
@ -144,5 +144,5 @@ export const useSettings = (): void => {
locale: localStorageValue[0], locale: localStorageValue[0],
}); });
} }
}, [router, setPreferredLanguages]); }, [router, setPreferredLanguages, preferredLanguages]);
}; };

20
src/hooks/useSmartLanguage.ts
View File

@ -1,7 +1,7 @@
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import { LanguageSwitcher } from "components/Inputs/LanguageSwitcher"; import { LanguageSwitcher } from "components/Inputs/LanguageSwitcher";
import { filterDefined, isDefined } from "helpers/asserts"; import { isDefined } from "helpers/asserts";
import { getPreferredLanguage } from "helpers/locales"; import { getPreferredLanguage } from "helpers/locales";
import { atoms } from "contexts/atoms"; import { atoms } from "contexts/atoms";
import { useAtomGetter } from "helpers/atoms"; import { useAtomGetter } from "helpers/atoms";
@ -21,14 +21,18 @@ export const useSmartLanguage = <T>({
const languages = useAtomGetter(atoms.localData.languages); const languages = useAtomGetter(atoms.localData.languages);
const router = useRouter(); const router = useRouter();
const availableLocales = useMemo(() => { const availableLocales = useMemo<Map<string, number>>(() => {
const memo = new Map<string, number>(); const memo: [string, number][] = [];
filterDefined(items).map((elem, index) => { items.map((elem, index) => {
const result = languageExtractor(elem); const result = isDefined(elem) ? languageExtractor(elem) : undefined;
if (isDefined(result)) memo.set(result, index); if (isDefined(result)) memo.push([result, index]);
}); });
return memo; memo.sort((a, b) => {
}, [items, languageExtractor]); const evaluate = (locale: string) => preferredLanguages.findIndex((elem) => elem === locale);
return evaluate(a[0]) - evaluate(b[0]);
});
return new Map(memo);
}, [items, languageExtractor, preferredLanguages]);
const [selectedTranslationIndex, setSelectedTranslationIndex] = useState<number | undefined>(); const [selectedTranslationIndex, setSelectedTranslationIndex] = useState<number | undefined>();