]> git.parisson.com Git - mezzo.git/commitdiff
[#454] : resolving 23:59
authorEmilie Zawadzki <zawadzki@ircam.fr>
Wed, 15 Feb 2017 14:36:26 +0000 (15:36 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 15 Feb 2017 16:08:54 +0000 (17:08 +0100)
app/templates/agenda/includes/event_date.html

index 9068627e6a5e03936ba1f5271ae71c33c77fd4ad..e7d77c9b889ef93ba6611cf9ba32fc1b31366980 100644 (file)
             {% else %}
                 {% trans "and" %}
             {% endif %}
-            {{ event.end|date:"DATE_EVENT_FORMAT" }},<br> {{ event.start|time:"TIME_FORMAT" }} - {{ event.end|time:"TIME_FORMAT" }}
+            {{ event.end|date:"DATE_EVENT_FORMAT" }},<br> {{ event.start|time:"TIME_FORMAT" }}
+            {% if event.end and event.end|date:"H:i" != "23:59" %}
+            - {{ event.end|time:"TIME_FORMAT" }}
+            {% endif %}
           {% endif %}
         <!-- Start and end date are completely different  -->
         {% else %}