From 3f2bb3beaed39f996a5ce175e10a0d795ebbe94a Mon Sep 17 00:00:00 2001
From: Raphael Michel
- {% if event.settings.show_times %} - {% blocktrans trimmed with time=event.date_from|date:"TIME_FORMAT" %} - Begin: {{ time }} +
+ {{ event.get_date_range_display }}
+ {% if event.settings.show_times %}
+
+ {% blocktrans trimmed with time=event.date_from|date:"TIME_FORMAT" %}
+ Begin: {{ time }}
+ {% endblocktrans %}
+ {% endif %}
+ {% if event.date_admission %}
+
+ {% if event.date_admission|date:"SHORT_DATE_FORMAT" == event.date_from|date:"SHORT_DATE_FORMAT" %}
+ {% blocktrans trimmed with time=event.date_admission|date:"TIME_FORMAT" %}
+ Admission: {{ time }}
+ {% endblocktrans %}
+ {% else %}
+ {% blocktrans trimmed with datetime=event.date_admission|date:"SHORT_DATETIME_FORMAT" %}
+ Admission: {{ datetime }}
{% endblocktrans %}
{% endif %}
- {% if event.date_admission and event.settings.show_times %}
-
- {% endif %}
- {% if event.date_admission %}
- {% if event.date_admission|date:"SHORT_DATE_FORMAT" == event.date_from|date:"SHORT_DATE_FORMAT" %}
- {% blocktrans trimmed with time=event.date_admission|date:"TIME_FORMAT" %}
- Admission: {{ time }}
- {% endblocktrans %}
- {% else %}
- {% blocktrans trimmed with datetime=event.date_admission|date:"SHORT_DATETIME_FORMAT" %}
- Admission: {{ datetime }}
- {% endblocktrans %}
- {% endif %}
- {% endif %}
-
-
- {% trans "Add to Calendar" %}
-
-
-
- {% trans "Add to Calendar" %}
+ {% endif %}
+
+
+ {% trans "Add to Calendar" %}