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

Support for daterange in spanish (#1125)

Browse Source
This commit is contained in:
Alvaro Enrique Ruano
2018-12-17 15:32:15 -06:00
committed by Raphael Michel
parent cf4b2544f2
commit 1edcd47703
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,13 @@ def daterange(df, dt):
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"))
elif lng.startswith("es"):
if df.year == dt.year and df.month == dt.month and df.day == dt.day:
return "{}".format(_date(df, "DATE_FORMAT"))
elif df.year == dt.year and df.month == dt.month:
return "{} - {} de {} de {}".format(_date(df, "j"), _date(dt, "j"), _date(dt, "F"), _date(dt, "Y"))
elif df.year == dt.year:
return "{} de {} - {} de {} de {}".format(_date(df, "j"), _date(df, "F"), _date(dt, "j"), _date(dt, "F"), _date(dt, "Y"))
return _("{date_from} – {date_to}").format(
date_from=_date(df, "DATE_FORMAT"), date_to=_date(dt, "DATE_FORMAT")

27
src/tests/helpers/test_daterange.py
View File

@@ -17,6 +17,12 @@ def test_same_day_english():
assert daterange(df, df) == "Feb. 1st, 2003"
def test_same_day_spanish():
with translation.override('es'):
df = date(2003, 2, 1)
assert daterange(df, df) == "1 de Febrero de 2003"
def test_same_month_german():
with translation.override('de'):
df = date(2003, 2, 1)
@@ -31,6 +37,13 @@ def test_same_month_english():
assert daterange(df, dt) == "Feb. 1st – 3rd, 2003"
def test_same_month_spanish():
with translation.override('es'):
df = date(2003, 2, 1)
dt = date(2003, 2, 3)
assert daterange(df, dt) == "1 - 3 de Febrero de 2003"
def test_same_year_german():
with translation.override('de'):
df = date(2003, 2, 1)
@@ -45,6 +58,13 @@ def test_same_year_english():
assert daterange(df, dt) == "Feb. 1st – April 3rd, 2003"
def test_same_year_spanish():
with translation.override('es'):
df = date(2003, 2, 1)
dt = date(2003, 4, 3)
assert daterange(df, dt) == "1 de Febrero - 3 de Abril de 2003"
def test_different_dates_german():
with translation.override('de'):
df = date(2003, 2, 1)
@@ -57,3 +77,10 @@ def test_different_dates_english():
df = date(2003, 2, 1)
dt = date(2005, 4, 3)
assert daterange(df, dt) == "Feb. 1, 2003 – April 3, 2005"
def test_different_dates_spanish():
with translation.override('es'):
df = date(2003, 2, 1)
dt = date(2005, 4, 3)
assert daterange(df, dt) == "1 de Febrero de 2003 – 3 de Abril de 2005"