mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-25 07:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #36543 -- Fixed time formats for fr_CA.

Browse Source 
Thanks Chris Anderson for the report.
This commit is contained in:
Mridul Dhall 2025-08-08 17:12:31 +01:00 committed by Sarah Boyce
parent 748551fea0
commit b67a36ec6f
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/conf/locale/fr_CA/formats.py
View File

@ -3,12 +3,12 @@
# The *_FORMAT strings use the Django date format syntax, # The *_FORMAT strings use the Django date format syntax,
# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date # see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = "j F Y" # 31 janvier 2024 DATE_FORMAT = "j F Y" # 31 janvier 2024
TIME_FORMAT = "H\xa0h\xa0i" # 13 h 40 TIME_FORMAT = "H\xa0\\h\xa0i" # 13 h 40
DATETIME_FORMAT = "j F Y, H\xa0h\xa0i" # 31 janvier 2024, 13 h 40 DATETIME_FORMAT = "j F Y, H\xa0\\h\xa0i" # 31 janvier 2024, 13 h 40
YEAR_MONTH_FORMAT = "F Y" YEAR_MONTH_FORMAT = "F Y"
MONTH_DAY_FORMAT = "j F" MONTH_DAY_FORMAT = "j F"
SHORT_DATE_FORMAT = "Y-m-d" SHORT_DATE_FORMAT = "Y-m-d"
SHORT_DATETIME_FORMAT = "Y-m-d H\xa0h\xa0i" SHORT_DATETIME_FORMAT = "Y-m-d H\xa0\\h\xa0i"
FIRST_DAY_OF_WEEK = 0 # Dimanche FIRST_DAY_OF_WEEK = 0 # Dimanche
# The *_INPUT_FORMATS strings use the Python strftime format syntax, # The *_INPUT_FORMATS strings use the Python strftime format syntax,

21
tests/i18n/tests.py
View File

@ -1158,6 +1158,27 @@ class FormattingTests(SimpleTestCase):
), ),
) )
def test_uncommon_locale_formats(self):
testcases = {
# French Canadian locale uses 'h' as time format seperator.
("fr-ca", time_format, (self.t, "TIME_FORMAT")): "10\xa0h\xa015",
(
"fr-ca",
date_format,
(self.dt, "DATETIME_FORMAT"),
): "31 décembre 2009, 20\xa0h\xa050",
(
"fr-ca",
date_format,
(self.dt, "SHORT_DATETIME_FORMAT"),
): "2009-12-31 20\xa0h\xa050",
}
for testcase, expected in testcases.items():
locale, format_function, format_args = testcase
with self.subTest(locale=locale, expected=expected):
with translation.override(locale, deactivate=True):
self.assertEqual(expected, format_function(*format_args))
def test_sub_locales(self): def test_sub_locales(self):
""" """
Check if sublocales fall back to the main locale Check if sublocales fall back to the main locale