diff --git a/apps/client/src/utils/formatters.ts b/apps/client/src/utils/formatters.ts index d3209be7b..664580c65 100644 --- a/apps/client/src/utils/formatters.ts +++ b/apps/client/src/utils/formatters.ts @@ -1,3 +1,5 @@ +import options from "../services/options"; + type DateTimeStyle = "full" | "long" | "medium" | "short" | "none" | undefined; /** @@ -8,7 +10,7 @@ export function formatDateTime(date: string | Date | number | null | undefined, return ""; } - const locale = navigator.language; + const locale = options.get("formattingLocale") ?? options.get("locale") ?? navigator.language; let parsedDate; if (typeof date === "string" || typeof date === "number") { @@ -24,7 +26,7 @@ export function formatDateTime(date: string | Date | number | null | undefined, if (timeStyle !== "none" && dateStyle !== "none") { // Format the date and time - const formatter = new Intl.DateTimeFormat(navigator.language, { dateStyle, timeStyle }); + const formatter = new Intl.DateTimeFormat(locale, { dateStyle, timeStyle }); return formatter.format(parsedDate); } else if (timeStyle === "none" && dateStyle !== "none") { // Format only the date diff --git a/apps/client/src/widgets/type_widgets/options/i18n.tsx b/apps/client/src/widgets/type_widgets/options/i18n.tsx index d69e2a395..9ebca626b 100644 --- a/apps/client/src/widgets/type_widgets/options/i18n.tsx +++ b/apps/client/src/widgets/type_widgets/options/i18n.tsx @@ -44,7 +44,7 @@ function LocalizationOptions() { - {isElectron() && + { }