Fix a bug in event date

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index afe4796c50b3a6668dfa3e4fd5304d36ee27495c..9ac2e89fd3b1cc69ff7396db2ba2f123d91dc89e 100644 (file)
--- 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 %}