From f6387df37b708f52a7f47da49963e909c01e584b Mon Sep 17 00:00:00 2001 From: Candide U <55474996+candideu@users.noreply.github.com> Date: Mon, 29 Jan 2024 19:40:27 -0500 Subject: [PATCH] Fixed #35152 -- Added en_CA locale formats. Formatting rules sourced from: - https://www.noslangues-ourlanguages.gc.ca/en/writing-tips-plus/numbers-decimal-fractions.html - https://www.noslangues-ourlanguages.gc.ca/en/writing-tips-plus/time-of-day-elapsed-time.html - 1ac397674b2f64d48e66502a20b9d9ca6bfb579a --- django/conf/locale/en_CA/__init__.py | 0 django/conf/locale/en_CA/formats.py | 31 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 django/conf/locale/en_CA/__init__.py create mode 100644 django/conf/locale/en_CA/formats.py diff --git a/django/conf/locale/en_CA/__init__.py b/django/conf/locale/en_CA/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/conf/locale/en_CA/formats.py b/django/conf/locale/en_CA/formats.py new file mode 100644 index 0000000000..b34551de90 --- /dev/null +++ b/django/conf/locale/en_CA/formats.py @@ -0,0 +1,31 @@ +# This file is distributed under the same license as the Django package. +# +# The *_FORMAT strings use the Django date format syntax, +# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date + +DATE_FORMAT = "j M Y" # 25 Oct 2006 +TIME_FORMAT = "P" # 2:30 p.m. +DATETIME_FORMAT = "j M Y, P" # 25 Oct 2006, 2:30 p.m. +YEAR_MONTH_FORMAT = "F Y" # October 2006 +MONTH_DAY_FORMAT = "j F" # 25 October +SHORT_DATE_FORMAT = "Y-m-d" +SHORT_DATETIME_FORMAT = "Y-m-d P" +FIRST_DAY_OF_WEEK = 0 # Sunday + +# The *_INPUT_FORMATS strings use the Python strftime format syntax, +# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior +DATE_INPUT_FORMATS = [ + "%Y-%m-%d", # '2006-05-15' + "%y-%m-%d", # '06-05-15' +] +DATETIME_INPUT_FORMATS = [ + "%Y-%m-%d %H:%M:%S", # '2006-05-15 14:30:57' + "%y-%m-%d %H:%M:%S", # '06-05-15 14:30:57' + "%Y-%m-%d %H:%M:%S.%f", # '2006-05-15 14:30:57.000200' + "%y-%m-%d %H:%M:%S.%f", # '06-05-15 14:30:57.000200' + "%Y-%m-%d %H:%M", # '2006-05-15 14:30' + "%y-%m-%d %H:%M", # '06-05-15 14:30' +] +DECIMAL_SEPARATOR = "." +THOUSAND_SEPARATOR = "\xa0" # non-breaking space +NUMBER_GROUPING = 3