From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 19 Oct 2016 17:08:50 +0000 (+0200)
Subject: Fix event date display
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e6ec961675c0a039579f04d29d58b53e95fcb09e;p=mezzo.git

Fix event date display
---

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index 5c1a5334..7b198416 100644
--- a/app/templates/agenda/includes/event_date.html
+++ b/app/templates/agenda/includes/event_date.html
@@ -6,7 +6,7 @@
     {{ event.start|date:event.date_format }}
     <!-- Start date with hour  -->
     {% if event.start and event.start|date:"H:i" != "23:59" %}
-        , {{ event.start|date:"H\hi" }}
+        - {{ event.start|date:"H\hi" }}
     {% endif %}
 
 <!-- Start and end date  -->
diff --git a/lib/django-prestashop b/lib/django-prestashop
index 37a97f9a..161ade38 160000
--- a/lib/django-prestashop
+++ b/lib/django-prestashop
@@ -1 +1 @@
-Subproject commit 37a97f9affa7979e52b6b0ff7c3bc39ce2c05302
+Subproject commit 161ade381ccbec5dcc731e1a37c95a52f7a5c73a
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 2329e6a7..2c6e15e6 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 2329e6a7bf55e852f0ad7686d17ff773a07aa6c6
+Subproject commit 2c6e15e6a66c507e05ab803016acd4d250f4d2dd