CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-22 12:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix presale date display in calendar

Browse Source
This commit is contained in:
Phin Wolkwitz
2025-12-10 13:31:20 +01:00
parent e1f5678d7c
commit 5fa40fd10b
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/presale/templates/pretixpresale/fragment_calendar.html
+3 -3
View File
@@ -55,7 +55,7 @@
running running
{% elif event.event.presale_has_ended %} {% elif event.event.presale_has_ended %}
over over
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %} {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
soon soon
{% else %} {% else %}
soon soon
@@ -108,9 +108,9 @@
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %} <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
{% elif event.event.presale_has_ended %} {% elif event.event.presale_has_ended %}
{% trans "Sale over" %} {% trans "Sale over" %}
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %} {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
<span class="fa fa-ticket" aria-hidden="true"></span> <span class="fa fa-ticket" aria-hidden="true"></span>
{% with date_human=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" date_iso=event.event.presale_start|date_fast:"c" %} {% with date_human=event.event.effective_presale_start|date_fast:"SHORT_DATE_FORMAT" date_iso=event.event.effective_presale_start|date_fast:"c" %}
{% blocktrans with start_date="<time datetime='"|add:date_iso|add:"'>"|add:date_human|add:"</time>"|safe %} {% blocktrans with start_date="<time datetime='"|add:date_iso|add:"'>"|add:date_human|add:"</time>"|safe %}
from {{ start_date }} from {{ start_date }}
{% endblocktrans %} {% endblocktrans %}
src/pretix/presale/templates/pretixpresale/fragment_day_calendar.html
+3 -3
View File
@@ -52,7 +52,7 @@
running running
{% elif event.event.presale_has_ended %} {% elif event.event.presale_has_ended %}
over over
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %} {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
soon soon
{% else %} {% else %}
soon soon
@@ -114,9 +114,9 @@
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %} <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
{% elif event.event.presale_has_ended %} {% elif event.event.presale_has_ended %}
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sale over" %} <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sale over" %}
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %} {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
<span class="fa fa-ticket" aria-hidden="true"></span> <span class="fa fa-ticket" aria-hidden="true"></span>
{% blocktrans with start_date=event.event.presale_start|date:"SHORT_DATE_FORMAT" %} {% blocktrans with start_date=event.event.effective_presale_start|date:"SHORT_DATE_FORMAT" %}
from {{ start_date }} from {{ start_date }}
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
+3 -3
View File
@@ -24,7 +24,7 @@
running running
{% elif event.event.presale_has_ended %} {% elif event.event.presale_has_ended %}
over over
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %} {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
soon soon
{% else %} {% else %}
soon soon
@@ -77,9 +77,9 @@
<span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %} <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
{% elif event.event.presale_has_ended %} {% elif event.event.presale_has_ended %}
{% trans "Sale over" %} {% trans "Sale over" %}
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %} {% elif event.event.settings.presale_start_show_date and event.event.effective_presale_start %}
<span class="fa fa-ticket" aria-hidden="true"></span> <span class="fa fa-ticket" aria-hidden="true"></span>
{% blocktrans with start_date=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" %} {% blocktrans with start_date=event.event.effective_presale_start|date_fast:"SHORT_DATE_FORMAT" %}
from {{ start_date }} from {{ start_date }}
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}