Skip to content

fix: handle missing region in navigator.language for chart locale #973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fortmarek merged 3 commits into from
Mar 4, 2026
Merged

fix: handle missing region in navigator.language for chart locale #973

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ebeab3
fix: handle missing region in navigator.language for chart locale
fortmarek Mar 4, 2026
3247526
Remove unnecessary locale() wrapper
fortmarek Mar 4, 2026
61cded3
lint code
fortmarek Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions web/js/Chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function formatBytes(bytes) {
const formatters = {
toLocaleDate: (el) => (value, _) => {
const date = new Date(value);
return date.toLocaleDateString(locale(), {
return date.toLocaleDateString(navigator.language, {
day: "numeric",
month: "short",
});
Expand All @@ -82,10 +82,7 @@ const tooltipFormatters = {
formatHours: (value) => formatHours(value, { includeMinutes: true }),
};

function locale() {
const region = (navigator.language || navigator.userLanguage).split("-")[1];
return `en-${region}`;
}


export default {
mounted() {
Expand Down Expand Up @@ -343,23 +340,23 @@ function tooltipFormatter(options = {}) {
if (!Number.isNaN(Date.parse(title))) {
const date = new Date(title);
if (options.dateFormat == "minute") {
title = date.toLocaleDateString(locale(), {
title = date.toLocaleDateString(navigator.language, {
day: "numeric",
month: "short",
year: "numeric",
hour: "numeric",
minute: "numeric",
});
} else if (options.dateFormat == "hour") {
const dateStr = date.toLocaleDateString(locale(), {
const dateStr = date.toLocaleDateString(navigator.language, {
day: "numeric",
month: "short",
year: "numeric",
});
const hour = String(date.getHours()).padStart(2, "0");
title = `${dateStr}, ${hour}:00`;
} else {
title = date.toLocaleDateString(locale(), {
title = date.toLocaleDateString(navigator.language, {
day: "numeric",
month: "short",
year: "numeric",
Expand Down
Loading