restructure userLocales logic

re-structure number formatter functions.
Use userLocales more properly, so it's never undefined.
This commit is contained in:
Aneimytis committed 2022-05-08 05:00:24 -05:00
1 parent 17c9af130a
commit 2cd383dd12
2 files changed
+44 -38

No files matched your search

@@ -434,32 +434,38 @@ function roundDown(num) {
}
function numberFormat(numberState) {
let userLocales;
try {
userLocales = new URL(
Array.from(document.querySelectorAll("head > link[rel='search']"))
?.find((n) => n?.getAttribute("href")?.includes("?locale="))
?.getAttribute("href")
)?.searchParams?.get("locale");
} catch {
userLocales = document.documentElement.lang;
}
let numberDisplay;
if (extConfig.numberDisplayRoundDown === false) {
numberDisplay = numberState;
} else {
numberDisplay = roundDown(numberState);
}
return getNumberFormatter(extConfig.numberDisplayFormat, userLocales).format(
return getNumberFormatter(extConfig.numberDisplayFormat).format(
numberDisplay
);
}
function getNumberFormatter(optionSelect, userLocales) {
function getNumberFormatter(optionSelect) {
let userLocales;
if (document.documentElement.lang) {
userLocales = document.documentElement.lang;
} else if (navigator.language) {
userLocales = navigator.language;
} else {
try {
userLocales = new URL(
Array.from(document.querySelectorAll("head > link[rel='search']"))
?.find((n) => n?.getAttribute("href")?.includes("?locale="))
?.getAttribute("href")
)?.searchParams?.get("locale");
} catch {
cLog('Cannot find browser locale. Use en as default for number formatting.');
userLocales = 'en';
}
}
let formatterNotation;
let formatterCompactDisplay;
switch (optionSelect) {
case "compactLong":
formatterNotation = "compact";
@@ -476,7 +482,7 @@ function getNumberFormatter(optionSelect, userLocales) {
}
const formatter = Intl.NumberFormat(
document.documentElement.lang || userLocales || navigator.language,
userLocales,
{
notation: formatterNotation,
compactDisplay: formatterCompactDisplay,