p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #34784 -- Adjusted SHORT_DATE_FORMAT in various French variants.

This commit is contained in:
Claude Paroz 2023-08-23 17:26:23 +02:00 committed by Mariusz Felisiak
parent f6ed2c36dd
commit fdf14cfc01
5 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/conf/locale/fr/formats.py
View File

@ -7,8 +7,8 @@ TIME_FORMAT = "H:i"
DATETIME_FORMAT = "j F Y H:i" DATETIME_FORMAT = "j F Y H:i"
YEAR_MONTH_FORMAT = "F Y" YEAR_MONTH_FORMAT = "F Y"
MONTH_DAY_FORMAT = "j F" MONTH_DAY_FORMAT = "j F"
SHORT_DATE_FORMAT = "j N Y" SHORT_DATE_FORMAT = "d/m/Y"
SHORT_DATETIME_FORMAT = "j N Y H:i" SHORT_DATETIME_FORMAT = "d/m/Y H:i"
FIRST_DAY_OF_WEEK = 1 # Monday FIRST_DAY_OF_WEEK = 1 # Monday
# The *_INPUT_FORMATS strings use the Python strftime format syntax, # The *_INPUT_FORMATS strings use the Python strftime format syntax,
@ -16,17 +16,11 @@ FIRST_DAY_OF_WEEK = 1 # Monday
DATE_INPUT_FORMATS = [ DATE_INPUT_FORMATS = [
"%d/%m/%Y", # '25/10/2006' "%d/%m/%Y", # '25/10/2006'
"%d/%m/%y", # '25/10/06' "%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 = [ DATETIME_INPUT_FORMATS = [
"%d/%m/%Y %H:%M:%S", # '25/10/2006 14:30:59' "%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:%S.%f", # '25/10/2006 14:30:59.000200'
"%d/%m/%Y %H:%M", # '25/10/2006 14:30' "%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 = "," DECIMAL_SEPARATOR = ","
THOUSAND_SEPARATOR = "\xa0" # non-breaking space THOUSAND_SEPARATOR = "\xa0" # non-breaking space

0
django/conf/locale/fr_BE/__init__.py Normal file
View File

32
django/conf/locale/fr_BE/formats.py Normal file
View File

@ -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

0
django/conf/locale/fr_CH/__init__.py Normal file
View File

32
django/conf/locale/fr_CH/formats.py Normal file
View File

@ -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