Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Show time format of graphs based on browser's language (#2048)
Sasha Fonsecabbe3caba6a58
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex edd2c29321..0fde4995b9 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -28,6 +28,7 @@ All notable changes to this project will be documented in this file.- API route `GET /api/v1/sites/:site_id`- Hovering on top of list items will now show a [tooltip with the exact number instead of a shortened version](https://github.com/plausible/analytics/discussions/1968)- Filter goals in realtime filter by clicking goal name+- The time format (12 hour or 24 hour) for graph timelines is now presented based on the browser's defined language### Fixed- UI fix where multi-line text in pills would not be underlined properly on small screens.diff --git a/assets/js/dashboard/stats/graph/graph-util.js b/assets/js/dashboard/stats/graph/graph-util.jsindex 808c6f0840..d4e854b5f0 100644--- a/assets/js/dashboard/stats/graph/graph-util.js+++ b/assets/js/dashboard/stats/graph/graph-util.js@@ -10,13 +10,20 @@ export const dateFormatter = (interval, longForm) => {} else if (interval === 'date') {return formatDay(date);} else if (interval === 'hour') {+ var uses12hTime = /h12/.test(+ Intl.DateTimeFormat(navigator.language, { hour: 'numeric' })+ .resolvedOptions()+ .hourCycle+ );const parts = isoDate.split(/[^0-9]/);date = new Date(parts[0], parts[1] - 1, parts[2], parts[3], parts[4], parts[5])- var hours = date.getHours(); // Not sure why getUTCHours doesn't work here- var ampm = hours >= 12 ? 'pm' : 'am';- hours = hours % 12;- hours = hours ? hours : 12; // the hour '0' should be '12'- return hours + ampm;+ var hours = Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(date);+ if (uses12hTime) {+ hours = hours.toLowerCase().replace(/\s/g, "");+ } else {+ hours = hours.concat("h");+ }+ return hours;} else if (interval === 'minute') {if (longForm) {const minutesAgo = Math.abs(isoDate)