From c9c4adce9bc3e225ba9ee429f6752d016612c3c3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= <Jeremy@iMac-de-Jeremy.local>
Date: Fri, 21 Oct 2016 10:05:50 +0200
Subject: [PATCH] Fix a bug in event date

---
 app/templates/agenda/includes/event_date.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index afe4796c..9ac2e89f 100644
--- a/app/templates/agenda/includes/event_date.html
+++ b/app/templates/agenda/includes/event_date.html
@@ -1,7 +1,7 @@
 {% load i18n %}
-{% load event_tags %}
+{% load event_tags pages_tags mezzanine_tags %}
+
 
-{% spaceless %}
     <!-- Start date only  -->
     {% if event.start and not event.end %}
         {{ event.start|date:event.date_format }}
@@ -68,7 +68,12 @@
         <!-- Start and end date are completely different  -->
         {% else %}
             {{ event.start|date:"j F" }} {% trans "to" %} {{ event.end|date:"j F" }}
+            <!-- Start date with hour  -->
+            {% if event.end and event.end|date:"H:i" != "23:59" %}
+                , {{ event.start|date:" H\hi" }} - {{ event.end|date:"H\hi" }}
+            {% else %}
+                , {{ event.start|date:" H\hi" }}
+            {% endif %}
         {% endif %}
 
     {% endif %}
-{% endspaceless %}
-- 
2.39.5