Mercurial > gemma

changeset 4710:558417908b37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hydrological_conditions: localize datestrings
author Thomas Junk <thomas.junk@intevation.de>
date Thu, 17 Oct 2019 11:51:23 +0200
parents e6fb2b6ecf36
children 13575ffb8c1f
files client/src/components/gauge/HydrologicalConditions.vue client/src/lib/datelocalization.js
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/gauge/HydrologicalConditions.vue	Thu Oct 17 10:40:29 2019 +0200
+++ b/client/src/components/gauge/HydrologicalConditions.vue	Thu Oct 17 11:51:23 2019 +0200
@@ -615,12 +615,12 @@
               : d3.timeMinute(date) < date
               ? d3.timeFormat(":%S")
               : d3.timeHour(date) < date
-              ? d3.timeFormat("%I:%M")
+              ? d3.timeFormat("%H:%M")
               : d3.timeDay(date) < date
-              ? d3.timeFormat("%I %p")
+              ? d3.timeFormat("%H")
               : d3.timeMonth(date) < date
               ? d3.timeWeek(date) < date
-                ? d3.timeFormat("%a %d")
+                ? d3.timeFormat("%b %d")
                 : d3.timeFormat("%b %d")
               : d3.timeFormat("%B"))(date);
           }),
--- a/client/src/lib/datelocalization.js	Thu Oct 17 10:40:29 2019 +0200
+++ b/client/src/lib/datelocalization.js	Thu Oct 17 11:51:23 2019 +0200
@@ -1,7 +1,7 @@
 import app from "@/main";
 const localeDateString = {
   dateTime: "%a %e %b %X %Y",
-  date: app.$gettext("%d/%m/%Y"),
+  date: "%d/%m/%Y",
   time: app.$gettext("%H:%M:%S"),
   periods: [app.$gettext("AM"), app.$gettext("PM")],
   days: [