mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #33661 -- Corrected Catalan date-format localization.

Browse Source 
Changed DATE_FORMAT, DATETIME_FORMAT and MONTH_DAY_FORMAT
to use E placeholder (Month, locale specific alternative)
to handle both “de gener” and contracted “d’abril” cases.

Thanks to Ferran Jovell for review.
This commit is contained in:
mpachas
2022-04-28 15:12:15 +02:00
committed by Carlton Gibson
parent ce586ed693
commit aa28c392b9
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/i18n/tests.py
View File

@@ -865,11 +865,14 @@ class FormattingTests(SimpleTestCase):
self.maxDiff = 3000
# Catalan locale
with translation.override("ca", deactivate=True):
self.assertEqual(r"j \d\e F \d\e Y", get_format("DATE_FORMAT"))
self.assertEqual(r"j E \d\e Y", get_format("DATE_FORMAT"))
self.assertEqual(1, get_format("FIRST_DAY_OF_WEEK"))
self.assertEqual(",", get_format("DECIMAL_SEPARATOR"))
self.assertEqual("10:15", time_format(self.t))
self.assertEqual("31 de desembre de 2009", date_format(self.d))
self.assertEqual(
"1 d'abril de 2009", date_format(datetime.date(2009, 4, 1))
)
self.assertEqual(
"desembre del 2009", date_format(self.d, "YEAR_MONTH_FORMAT")
)