From fdf14cfc01558bfa6f990560d38531c82fb5c024 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Wed, 23 Aug 2023 17:26:23 +0200
Subject: [PATCH] Fixed #34784 -- Adjusted SHORT_DATE_FORMAT in various French
variants.
---
django/conf/locale/fr/formats.py | 10 ++-------
django/conf/locale/fr_BE/__init__.py | 0
django/conf/locale/fr_BE/formats.py | 32 ++++++++++++++++++++++++++++
django/conf/locale/fr_CH/__init__.py | 0
django/conf/locale/fr_CH/formats.py | 32 ++++++++++++++++++++++++++++
5 files changed, 66 insertions(+), 8 deletions(-)
create mode 100644 django/conf/locale/fr_BE/__init__.py
create mode 100644 django/conf/locale/fr_BE/formats.py
create mode 100644 django/conf/locale/fr_CH/__init__.py
create mode 100644 django/conf/locale/fr_CH/formats.py
diff --git a/django/conf/locale/fr/formats.py b/django/conf/locale/fr/formats.py
index 5845e6aa73..338d8ad3ee 100644
--- a/django/conf/locale/fr/formats.py
+++ b/django/conf/locale/fr/formats.py
@@ -7,8 +7,8 @@ TIME_FORMAT = "H:i"
DATETIME_FORMAT = "j F Y H:i"
YEAR_MONTH_FORMAT = "F Y"
MONTH_DAY_FORMAT = "j F"
-SHORT_DATE_FORMAT = "j N Y"
-SHORT_DATETIME_FORMAT = "j N Y H:i"
+SHORT_DATE_FORMAT = "d/m/Y"
+SHORT_DATETIME_FORMAT = "d/m/Y H:i"
FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
@@ -16,17 +16,11 @@ FIRST_DAY_OF_WEEK = 1 # Monday
DATE_INPUT_FORMATS = [
"%d/%m/%Y", # '25/10/2006'
"%d/%m/%y", # '25/10/06'
- "%d.%m.%Y", # Swiss [fr_CH] '25.10.2006'
- "%d.%m.%y", # Swiss [fr_CH] '25.10.06'
- # '%d %B %Y', '%d %b %Y', # '25 octobre 2006', '25 oct. 2006'
]
DATETIME_INPUT_FORMATS = [
"%d/%m/%Y %H:%M:%S", # '25/10/2006 14:30:59'
"%d/%m/%Y %H:%M:%S.%f", # '25/10/2006 14:30:59.000200'
"%d/%m/%Y %H:%M", # '25/10/2006 14:30'
- "%d.%m.%Y %H:%M:%S", # Swiss [fr_CH), '25.10.2006 14:30:59'
- "%d.%m.%Y %H:%M:%S.%f", # Swiss (fr_CH), '25.10.2006 14:30:59.000200'
- "%d.%m.%Y %H:%M", # Swiss (fr_CH), '25.10.2006 14:30'
]
DECIMAL_SEPARATOR = ","
THOUSAND_SEPARATOR = "\xa0" # non-breaking space
diff --git a/django/conf/locale/fr_BE/__init__.py b/django/conf/locale/fr_BE/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/conf/locale/fr_BE/formats.py b/django/conf/locale/fr_BE/formats.py
new file mode 100644
index 0000000000..84f065713e
--- /dev/null
+++ b/django/conf/locale/fr_BE/formats.py
@@ -0,0 +1,32 @@
+# 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 F Y"
+TIME_FORMAT = "H:i"
+DATETIME_FORMAT = "j F Y H:i"
+YEAR_MONTH_FORMAT = "F Y"
+MONTH_DAY_FORMAT = "j F"
+SHORT_DATE_FORMAT = "d.m.Y"
+SHORT_DATETIME_FORMAT = "d.m.Y H:i"
+FIRST_DAY_OF_WEEK = 1 # Monday
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
+DATE_INPUT_FORMATS = [
+ "%d.%m.%Y", # '25.10.2006'
+ "%d.%m.%y", # '25.10.06'
+ "%d/%m/%Y", # '25/10/2006'
+ "%d/%m/%y", # '25/10/06'
+]
+DATETIME_INPUT_FORMATS = [
+ "%d.%m.%Y %H:%M:%S", # '25.10.2006 14:30:59'
+ "%d.%m.%Y %H:%M:%S.%f", # '25.10.2006 14:30:59.000200'
+ "%d.%m.%Y %H:%M", # '25.10.2006 14:30'
+ "%d/%m/%Y %H:%M:%S", # '25/10/2006 14:30:59'
+ "%d/%m/%Y %H:%M:%S.%f", # '25/10/2006 14:30:59.000200'
+ "%d/%m/%Y %H:%M", # '25/10/2006 14:30'
+]
+DECIMAL_SEPARATOR = ","
+THOUSAND_SEPARATOR = "\xa0" # non-breaking space
+NUMBER_GROUPING = 3
diff --git a/django/conf/locale/fr_CH/__init__.py b/django/conf/locale/fr_CH/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/conf/locale/fr_CH/formats.py b/django/conf/locale/fr_CH/formats.py
new file mode 100644
index 0000000000..84f065713e
--- /dev/null
+++ b/django/conf/locale/fr_CH/formats.py
@@ -0,0 +1,32 @@
+# 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 F Y"
+TIME_FORMAT = "H:i"
+DATETIME_FORMAT = "j F Y H:i"
+YEAR_MONTH_FORMAT = "F Y"
+MONTH_DAY_FORMAT = "j F"
+SHORT_DATE_FORMAT = "d.m.Y"
+SHORT_DATETIME_FORMAT = "d.m.Y H:i"
+FIRST_DAY_OF_WEEK = 1 # Monday
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
+DATE_INPUT_FORMATS = [
+ "%d.%m.%Y", # '25.10.2006'
+ "%d.%m.%y", # '25.10.06'
+ "%d/%m/%Y", # '25/10/2006'
+ "%d/%m/%y", # '25/10/06'
+]
+DATETIME_INPUT_FORMATS = [
+ "%d.%m.%Y %H:%M:%S", # '25.10.2006 14:30:59'
+ "%d.%m.%Y %H:%M:%S.%f", # '25.10.2006 14:30:59.000200'
+ "%d.%m.%Y %H:%M", # '25.10.2006 14:30'
+ "%d/%m/%Y %H:%M:%S", # '25/10/2006 14:30:59'
+ "%d/%m/%Y %H:%M:%S.%f", # '25/10/2006 14:30:59.000200'
+ "%d/%m/%Y %H:%M", # '25/10/2006 14:30'
+]
+DECIMAL_SEPARATOR = ","
+THOUSAND_SEPARATOR = "\xa0" # non-breaking space
+NUMBER_GROUPING = 3