diff --git a/cli/Sources/Noora/NooraMock.swift b/cli/Sources/Noora/NooraMock.swift index 54db86ab..4b55c3a3 100644 --- a/cli/Sources/Noora/NooraMock.swift +++ b/cli/Sources/Noora/NooraMock.swift @@ -471,7 +471,7 @@ } } - private struct StandardOutputEvent: Equatable, Sendable { + private struct StandardOutputEvent: Equatable { let type: StandardPipelineType let content: String } diff --git a/web/js/Chart.js b/web/js/Chart.js index c36a70e7..a4a7461c 100644 --- a/web/js/Chart.js +++ b/web/js/Chart.js @@ -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", }); @@ -82,11 +82,6 @@ const tooltipFormatters = { formatHours: (value) => formatHours(value, { includeMinutes: true }), }; -function locale() { - const region = (navigator.language || navigator.userLanguage).split("-")[1]; - return `en-${region}`; -} - export default { mounted() { this.render(); @@ -343,7 +338,7 @@ 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", @@ -351,7 +346,7 @@ function tooltipFormatter(options = {}) { minute: "numeric", }); } else if (options.dateFormat == "hour") { - const dateStr = date.toLocaleDateString(locale(), { + const dateStr = date.toLocaleDateString(navigator.language, { day: "numeric", month: "short", year: "numeric", @@ -359,7 +354,7 @@ function tooltipFormatter(options = {}) { 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",