Event date format update

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index 1b8a84ab8bcad4017485b9d36b9c185a65b242fe..5c1a5334187e1704023b2d5f6f223ce46c0a6893 100644 (file)
--- a/app/templates/agenda/includes/event_date.html
+++ b/app/templates/agenda/includes/event_date.html
@@ -3,10 +3,10 @@
 
 <!-- Start date only  -->
 {% if event.start and not event.end %}
-    {{ event.start|date:"l j F" }}<br>
+    {{ 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  -->
@@ -14,20 +14,20 @@
     <!-- Start and end date is the same day  -->
     {% if event.start|date:"d.m.y" == event.end|date:"d.m.y" %}
         {% if not event.periods.all %}
-            {{ event.start|date:"l j F" }}<br>
+            {{ event.start|date:event.date_format }}
             <!-- 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" }}
+                - {{ event.start|date:" H\hi" }} - {{ event.end|date:"H\hi" }}
             {% else %}
-                {{ event.start|date:"H\hi" }}
+                - {{ event.start|date:" H\hi" }}
             {% endif %}
         {% else %}
-            {{ event.start|date:"l j F" }}<br>
+            {{ event.start|date:event.date_format }}
             {% for period in event.periods.all %}
                 {% if period.date_to and period.date_to|date:"H:i" != "23:59" %}
-                    {{ period.date_from|date:"H\hi" }} - {{ period.date_to|date:"H\hi" }}<br>
+                    - {{ period.date_from|date:"H\hi" }} - {{ period.date_to|date:"H\hi" }}
                 {% else %}
-                    {% if forloop.last or event.periods.all|length == 2 %} {% trans "and"%} {% elif not forloop.first %}, {% endif %}
+                    {% if forloop.last or event.periods.all|length == 2 %} {% trans "and"%} {% elif not forloop.first %}- {% endif %}
                         {{ period.date_from|date:"H\hi" }}
                 {% endif %}
             {% endfor %}
@@ -39,29 +39,30 @@
         {% with event.periods.all|same_time_in_periods as same_time_in_periods %}
         {% for period in event.periods.all %}
             {% if period.date_to and period.date_to|date:"H:i" != "23:59" %}
-                {{ period.date_from|date:"l j F" }}
+                {{ period.date_from|date:event.date_format }}
                 {% if period|period_is_more_than_hours:4 %}
-                    {{ period.date_from|date:"H\hi" }} {% trans "to" %} {{ period.date_to|date:"H\hi" }}<br>
+                    - {{ period.date_from|date:"H\hi" }} {% trans "to" %} {{ period.date_to|date:"H\hi" }}
                 {% else %}
-                    {{ period.date_from|date:"H\hi" }}<br>
+                    - {{ period.date_from|date:"H\hi" }}
                 {% endif %}
             {% else %}
                 {% if event.periods.all|length > 1 and not forloop.last %}
-                    {{ period.date_from|date:"l j F" }}{% if event.periods.all|length == 2 %} {% trans "and" %} {% else %}, {% endif %}
+                    {{ period.date_from|date:event.date_format }}{% if event.periods.all|length == 2 %} {% trans "and" %} {% else %}{% endif %}
                 {% else %}
-                    {{ period.date_from|date:"l j F" }}
+                    {{ period.date_from|date:event.date_format }}
                     {% if event.periods.all|length > 1 and forloop.first %} {% trans "and" %}{% endif %}
                 {% endif %}
                 {% if same_time_in_periods and forloop.last %}
                     {{ period.date_from|date:"H\hi" }}
                 {% elif not same_time_in_periods %}
-                    {{ period.date_from|date:"H\hi" }}<br>
+                    - {{ period.date_from|date:"H\hi" }}
                 {% endif %}
             {% endif %}
+            <br />
         {% endfor %}
         {% endwith %}
       {% else %}
-        {{ event.start|date:"l j F" }} {% trans "to" %} {{ event.end|date:"l j F" }}<br>{{ event.start|date:"H\hi" }} - {{ event.end|date:"H\hi" }}
+        {{ event.start|date:event.date_format }} {% trans "to" %} {{ event.end|date:event.date_format }} - {{ event.start|date:"H\hi" }} - {{ event.end|date:"H\hi" }}
       {% endif %}
     <!-- Start and end date are completely different  -->
     {% else %}