From 32a46001d2e97795d91659cdd3da50726baec926 Mon Sep 17 00:00:00 2001
From: Goutte <antoine.goutenoir@gmail.com>
Date: Sat, 16 Dec 2017 02:12:31 +0100
Subject: [PATCH] Set time format to 24h in the time series.

---
 CHANGELOG.md           | 1 +
 web/static/js/swapp.js | 4 ++--
 web/static/js/swapp.ls | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38f17aa..7071d56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 
 ## 1.0.0-rc8
 
+- [x] Set time format to 24h in the time series
 - [x] Add the disabled versions of Uranus and Neptune
 - [x] Add the `CME Catalogs` layer
 
diff --git a/web/static/js/swapp.js b/web/static/js/swapp.js
index 41cf230..513d742 100644
--- a/web/static/js/swapp.js
+++ b/web/static/js/swapp.js
@@ -506,8 +506,8 @@
       this.yScale = d3.scaleLinear().domain(this.yDataExtent);
       formatMillisecond = d3.timeFormat(".%L");
       formatSecond = d3.timeFormat(":%S");
-      formatMinute = d3.timeFormat("%I:%M");
-      formatHour = d3.timeFormat("%I:%M");
+      formatMinute = d3.timeFormat("%H:%M");
+      formatHour = d3.timeFormat("%H:%M");
       formatDay = d3.timeFormat("%a %d");
       formatWeek = d3.timeFormat("%b %d");
       formatMonth = d3.timeFormat("%B");
diff --git a/web/static/js/swapp.ls b/web/static/js/swapp.ls
index 4848d40..3164526 100644
--- a/web/static/js/swapp.ls
+++ b/web/static/js/swapp.ls
@@ -391,8 +391,8 @@ export class TimeSeries
 
     formatMillisecond = d3.timeFormat(".%L")
     formatSecond = d3.timeFormat(":%S")
-    formatMinute = d3.timeFormat("%I:%M")
-    formatHour = d3.timeFormat("%I:%M")
+    formatMinute = d3.timeFormat("%H:%M")
+    formatHour = d3.timeFormat("%H:%M")
     formatDay = d3.timeFormat("%a %d")
     formatWeek = d3.timeFormat("%b %d")
     formatMonth = d3.timeFormat("%B")
--
libgit2 0.21.2