CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fixed bugs and added test for date range rendering (#488)

Browse Source 
* fixed bug for same dates, added unit check for daterange

* fixed local language override in unit test
This commit is contained in:
scabux
2017-05-07 10:40:36 +02:00
committed by Raphael Michel
parent d6943bb1dd
commit 1b2895b0ca
2 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/helpers/daterange.py
View File

@@ -6,12 +6,16 @@ def daterange(df, dt):
lng = get_language()
if lng.startswith("de"):
if df.year == dt.year and df.month == dt.month:
if df.year == dt.year and df.month == dt.month and df.day == dt.day:
return "{}".format(_date(df, "j. F Y"))
elif df.year == dt.year and df.month == dt.month:
return "{}.–{}".format(_date(df, "j"), _date(dt, "j. F Y"))
elif df.year == dt.year:
return "{} – {}".format(_date(df, "j. F"), _date(dt, "j. F Y"))
elif lng.startswith("en"):
if df.year == dt.year and df.month == dt.month:
if df.year == dt.year and df.month == dt.month and df.day == dt.day:
return "{}".format(_date(df, "N jS, Y"))
elif df.year == dt.year and df.month == dt.month:
return "{} – {}".format(_date(df, "N jS"), _date(dt, "jS, Y"))
elif df.year == dt.year:
return "{} – {}".format(_date(df, "N jS"), _date(dt, "N jS, Y"))