diff --git a/src/pretix/helpers/daterange.py b/src/pretix/helpers/daterange.py index 6ad12ebe35..ac48eb3127 100644 --- a/src/pretix/helpers/daterange.py +++ b/src/pretix/helpers/daterange.py @@ -76,11 +76,11 @@ def daterange(df, dt, as_html=False): return format_html(base_format, _date(df, "j F"), until, _date(dt, "j F Y")) elif lng.startswith("en"): if df.year == dt.year and df.month == dt.month and df.day == dt.day: - return format_html(base_format, _date(df, "D, N jS, Y")) + return format_html(base_format, _date(df, "D, N j, Y")) elif df.year == dt.year and df.month == dt.month: - return format_html(base_format, _date(df, "N jS"), until, _date(dt, "jS, Y")) + return format_html(base_format, _date(df, "N j"), until, _date(dt, "j, Y")) elif df.year == dt.year: - return format_html(base_format, _date(df, "N jS"), until, _date(dt, "N jS, Y")) + return format_html(base_format, _date(df, "N j"), until, _date(dt, "N j, Y")) elif lng.startswith("es"): if df.year == dt.year and df.month == dt.month and df.day == dt.day: return format_html(base_format, _date(df, "DATE_FORMAT")) diff --git a/src/pretix/helpers/formats/en/formats.py b/src/pretix/helpers/formats/en/formats.py index 93ee82085f..ed65c1b5e8 100644 --- a/src/pretix/helpers/formats/en/formats.py +++ b/src/pretix/helpers/formats/en/formats.py @@ -38,5 +38,5 @@ SHORT_DATE_FORMAT = 'Y-m-d' SHORT_DATETIME_FORMAT = 'Y-m-d H:i' TIME_FORMAT = 'H:i' WEEK_FORMAT = '\\W W, o' -WEEK_DAY_FORMAT = 'D, M jS' +WEEK_DAY_FORMAT = 'D, M j' SHORT_MONTH_DAY_FORMAT = 'd.m.' diff --git a/src/pretix/helpers/formats/en_CA/formats.py b/src/pretix/helpers/formats/en_CA/formats.py index d7875e437d..fd1aa8dbb0 100644 --- a/src/pretix/helpers/formats/en_CA/formats.py +++ b/src/pretix/helpers/formats/en_CA/formats.py @@ -38,7 +38,7 @@ SHORT_DATE_FORMAT = "Y-m-d" SHORT_DATETIME_FORMAT = 'Y-m-d P' TIME_FORMAT = 'P' WEEK_FORMAT = '\\W W, o' -WEEK_DAY_FORMAT = 'D, M jS' +WEEK_DAY_FORMAT = 'D, M j' SHORT_MONTH_DAY_FORMAT = 'm/d' DATE_INPUT_FORMATS = [ diff --git a/src/pretix/helpers/formats/en_US/formats.py b/src/pretix/helpers/formats/en_US/formats.py index 0bb769f802..71b8350f16 100644 --- a/src/pretix/helpers/formats/en_US/formats.py +++ b/src/pretix/helpers/formats/en_US/formats.py @@ -25,7 +25,7 @@ SHORT_DATE_FORMAT = 'm/d/Y' SHORT_DATETIME_FORMAT = 'm/d/Y P' TIME_FORMAT = 'P' WEEK_FORMAT = '\\W W, o' -WEEK_DAY_FORMAT = 'D, M jS' +WEEK_DAY_FORMAT = 'D, M j' SHORT_MONTH_DAY_FORMAT = 'm/d' DATE_INPUT_FORMATS = [ diff --git a/src/tests/helpers/test_daterange.py b/src/tests/helpers/test_daterange.py index 8acd607166..922153088d 100644 --- a/src/tests/helpers/test_daterange.py +++ b/src/tests/helpers/test_daterange.py @@ -50,8 +50,8 @@ def test_same_day_german(): def test_same_day_english(): with translation.override('en'): df = date(2003, 2, 1) - assert daterange(df, df) == "Sat, Feb. 1st, 2003" - assert daterange(df, df, as_html=True) == '' + assert daterange(df, df) == "Sat, Feb. 1, 2003" + assert daterange(df, df, as_html=True) == '' def test_same_day_spanish(): @@ -82,10 +82,10 @@ def test_same_month_english(): with translation.override('en'): df = date(2003, 2, 1) dt = date(2003, 2, 3) - assert daterange(df, dt) == "Feb. 1st – 3rd, 2003" - assert daterange(df, dt, as_html=True) == ' ' \ + assert daterange(df, dt) == "Feb. 1 – 3, 2003" + assert daterange(df, dt, as_html=True) == ' ' \ ' until ' \ - '' + '' def test_same_month_spanish(): @@ -112,10 +112,10 @@ def test_same_year_english(): with translation.override('en'): df = date(2003, 2, 1) dt = date(2003, 4, 3) - assert daterange(df, dt) == "Feb. 1st – April 3rd, 2003" - assert daterange(df, dt, as_html=True) == ' ' \ + assert daterange(df, dt) == "Feb. 1 – April 3, 2003" + assert daterange(df, dt, as_html=True) == ' ' \ ' until ' \ - '' + '' def test_same_year_spanish():