p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[4.0.x] Refs #33476 -- Used vertical hanging indentation for format lists with inline comments. 

Lists with multiple values and comments per-line are reformatted
by Black to multiple lines with a single comment. For example:

DATE_INPUT_FORMATS =
    "%Y-%m-%d", "%m/%d/%Y", "%m/%d/%y",  # '2006-10-25', '10/25/2006', '10/25/06'
]

is reformatted to the:

DATE_INPUT_FORMATS =
    "%Y-%m-%d",
    "%m/%d/%Y",
    "%m/%d/%y",  # '2006-10-25', '10/25/2006', '10/25/06'
]

This reformats affected entries to multiple lines with corresponding
comments.

Backport of ca88caa103 from main
This commit is contained in:
Mariusz Felisiak 2022-01-31 10:10:46 +01:00 committed by Carlton Gibson
parent 1c74ac8648
commit 0c06819caa
38 changed files with 273 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/conf/global_settings.py
View File

@ -365,11 +365,17 @@ SHORT_DATETIME_FORMAT = 'm/d/Y P'
# https://docs.python.org/library/datetime.html#strftime-behavior
# * Note that these format strings are different from the ones to display dates
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
'%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
'%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
'%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
'%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%Y-%m-%d', # '2006-10-25'
'%m/%d/%Y', # '10/25/2006'
'%m/%d/%y', # '10/25/06'
'%b %d %Y', # 'Oct 25 2006'
'%b %d, %Y', # 'Oct 25, 2006'
'%d %b %Y', # '25 Oct 2006'
'%d %b, %Y', # '25 Oct, 2006'
'%B %d %Y', # 'October 25 2006'
'%B %d, %Y', # 'October 25, 2006'
'%d %B %Y', # '25 October 2006'
'%d %B, %Y', # '25 October, 2006'
]
# Default formats to be used when parsing times from input boxes, in order

4
django/conf/locale/ca/formats.py
View File

@ -14,8 +14,8 @@ 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 = [
# '31/12/2009', '31/12/09'
'%d/%m/%Y', '%d/%m/%y'
'%d/%m/%Y', # '31/12/2009'
'%d/%m/%y', # '31/12/09'
]
DATETIME_INPUT_FORMATS = [
'%d/%m/%Y %H:%M:%S',

9
django/conf/locale/cs/formats.py
View File

@ -14,9 +14,12 @@ 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', '%d.%m.%y', # '05.01.2006', '05.01.06'
'%d. %m. %Y', '%d. %m. %y', # '5. 1. 2006', '5. 1. 06'
# '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
'%d.%m.%Y', # '05.01.2006'
'%d.%m.%y', # '05.01.06'
'%d. %m. %Y', # '5. 1. 2006'
'%d. %m. %y', # '5. 1. 06'
# "%d. %B %Y", # '25. October 2006'
# "%d. %b. %Y", # '25. Oct. 2006'
]
# Kept ISO formats as one is in first position
TIME_INPUT_FORMATS = [

3
django/conf/locale/cy/formats.py
View File

@ -14,7 +14,8 @@ FIRST_DAY_OF_WEEK = 1 # 'Dydd Llun'
# 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', '%d/%m/%y', # '25/10/2006', '25/10/06'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

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

@ -14,8 +14,10 @@ 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', '%d.%m.%y', # '25.10.2006', '25.10.06'
# '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
# "%d. %B %Y", # '25. October 2006'
# "%d. %b. %Y", # '25. Oct. 2006'
]
DATETIME_INPUT_FORMATS = [
'%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'

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

@ -14,8 +14,10 @@ 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', '%d.%m.%y', # '25.10.2006', '25.10.06'
# '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
# "%d. %B %Y", # '25. October 2006'
# "%d. %b. %Y", # '25. Oct. 2006'
]
DATETIME_INPUT_FORMATS = [
'%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'

4
django/conf/locale/el/formats.py
View File

@ -14,7 +14,9 @@ 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 = [
'%d/%m/%Y', '%d/%m/%y', '%Y-%m-%d', # '25/10/2006', '25/10/06', '2006-10-25',
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
'%Y-%m-%d', # '2006-10-25'
]
DATETIME_INPUT_FORMATS = [
'%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'

16
django/conf/locale/en/formats.py
View File

@ -27,11 +27,17 @@ FIRST_DAY_OF_WEEK = 0
# Note that these format strings are different from the ones to display dates.
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
'%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
'%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
'%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
'%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%Y-%m-%d', # '2006-10-25'
'%m/%d/%Y', # '10/25/2006'
'%m/%d/%y', # '10/25/06'
'%b %d %Y', # 'Oct 25 2006'
'%b %d, %Y', # 'Oct 25, 2006'
'%d %b %Y', # '25 Oct 2006'
'%d %b, %Y', # '25 Oct, 2006'
'%B %d %Y', # 'October 25 2006'
'%B %d, %Y', # 'October 25, 2006'
'%d %B %Y', # '25 October 2006'
'%d %B, %Y', # '25 October, 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

15
django/conf/locale/en_AU/formats.py
View File

@ -14,11 +14,16 @@ 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 = [
'%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
# '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
# '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
# '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
# '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
# "%b %d %Y", # 'Oct 25 2006'
# "%b %d, %Y", # 'Oct 25, 2006'
# "%d %b %Y", # '25 Oct 2006'
# "%d %b, %Y", # '25 Oct, 2006'
# "%B %d %Y", # 'October 25 2006'
# "%B %d, %Y", # 'October 25, 2006'
# "%d %B %Y", # '25 October 2006'
# "%d %B, %Y", # '25 October, 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

15
django/conf/locale/en_GB/formats.py
View File

@ -14,11 +14,16 @@ 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', '%d/%m/%y', # '25/10/2006', '25/10/06'
# '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
# '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
# '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
# '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
# "%b %d %Y", # 'Oct 25 2006'
# "%b %d, %Y", # 'Oct 25, 2006'
# "%d %b %Y", # '25 Oct 2006'
# "%d %b, %Y", # '25 Oct, 2006'
# "%B %d %Y", # 'October 25 2006'
# "%B %d, %Y", # 'October 25, 2006'
# "%d %B %Y", # '25 October 2006'
# "%d %B, %Y", # '25 October, 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

4
django/conf/locale/es/formats.py
View File

@ -14,8 +14,8 @@ 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 = [
# '31/12/2009', '31/12/09'
'%d/%m/%Y', '%d/%m/%y'
'%d/%m/%Y', # '31/12/2009'
'%d/%m/%y', # '31/12/09'
]
DATETIME_INPUT_FORMATS = [
'%d/%m/%Y %H:%M:%S',

3
django/conf/locale/es_CO/formats.py
View File

@ -9,7 +9,8 @@ SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
FIRST_DAY_OF_WEEK = 1
DATE_INPUT_FORMATS = [
'%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
'%Y%m%d', # '20061025'
]

3
django/conf/locale/es_MX/formats.py
View File

@ -9,7 +9,8 @@ SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
FIRST_DAY_OF_WEEK = 1 # Monday: ISO 8601
DATE_INPUT_FORMATS = [
'%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
'%Y%m%d', # '20061025'
]
DATETIME_INPUT_FORMATS = [

3
django/conf/locale/es_NI/formats.py
View File

@ -9,7 +9,8 @@ SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
FIRST_DAY_OF_WEEK = 1 # Monday: ISO 8601
DATE_INPUT_FORMATS = [
'%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
'%Y%m%d', # '20061025'
]

4
django/conf/locale/es_PR/formats.py
View File

@ -10,8 +10,8 @@ SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
FIRST_DAY_OF_WEEK = 0 # Sunday
DATE_INPUT_FORMATS = [
# '31/12/2009', '31/12/09'
'%d/%m/%Y', '%d/%m/%y'
'%d/%m/%Y', # '31/12/2009'
'%d/%m/%y', # '31/12/09'
]
DATETIME_INPUT_FORMATS = [
'%d/%m/%Y %H:%M:%S',

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

@ -14,8 +14,10 @@ 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', '%d/%m/%y', # '25/10/2006', '25/10/06'
'%d.%m.%Y', '%d.%m.%y', # Swiss [fr_CH), '25.10.2006', '25.10.06'
'%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 = [

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

@ -16,8 +16,10 @@ FIRST_DAY_OF_WEEK = 1
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', # '2006-10-25'
'%d.%m.%Y.', '%d.%m.%y.', # '25.10.2006.', '25.10.06.'
'%d. %m. %Y.', '%d. %m. %y.', # '25. 10. 2006.', '25. 10. 06.'
'%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 = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

9
django/conf/locale/id/formats.py
View File

@ -14,11 +14,14 @@ 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', '%d/%m/%Y', # '25-10-2009', 25/10/2009'
'%d-%m-%y', '%d/%m/%y', # '25-10-09', 25/10/09'
'%d-%m-%Y', # '25-10-2009'
'%d/%m/%Y', # '25/10/2009'
'%d-%m-%y', # '25-10-09'
'%d/%m/%y', # '25/10/09'
'%d %b %Y', # '25 Oct 2006',
'%d %B %Y', # '25 October 2006'
'%m/%d/%y', '%m/%d/%Y', # '10/25/06', '10/25/2009'
'%m/%d/%y', # '10/25/06'
'%m/%d/%Y', # '10/25/2009'
]
TIME_INPUT_FORMATS = [

9
django/conf/locale/it/formats.py
View File

@ -14,9 +14,12 @@ FIRST_DAY_OF_WEEK = 1 # Lunedì
# 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', '%Y/%m/%d', # '25/10/2006', '2008/10/25'
'%d-%m-%Y', '%Y-%m-%d', # '25-10-2006', '2008-10-25'
'%d-%m-%y', '%d/%m/%y', # '25-10-06', '25/10/06'
'%d/%m/%Y', # '25/10/2006'
'%Y/%m/%d', # '2006/10/25'
'%d-%m-%Y', # '25-10-2006'
'%Y-%m-%d', # '2006-10-25'
'%d-%m-%y', # '25-10-06'
'%d/%m/%y', # '25/10/06'
]
DATETIME_INPUT_FORMATS = [
'%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'

14
django/conf/locale/ka/formats.py
View File

@ -15,10 +15,16 @@ FIRST_DAY_OF_WEEK = 1 # (Monday)
# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
'%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06'
# '%d %b %Y', '%d %b, %Y', '%d %b. %Y', # '25 Oct 2006', '25 Oct, 2006', '25 Oct. 2006'
# '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%Y-%m-%d', # '2006-10-25'
'%m/%d/%Y', # '10/25/2006'
'%m/%d/%y', # '10/25/06'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
# "%d %b %Y", # '25 Oct 2006'
# "%d %b, %Y", # '25 Oct, 2006'
# "%d %b. %Y", # '25 Oct. 2006'
# "%d %B %Y", # '25 October 2006'
# "%d %B, %Y", # '25 October, 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

16
django/conf/locale/ko/formats.py
View File

@ -15,11 +15,17 @@ SHORT_DATETIME_FORMAT = 'Y-n-j H:i'
# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
# '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
# '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
# '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
# '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%Y-%m-%d', # '2006-10-25'
'%m/%d/%Y', # '10/25/2006'
'%m/%d/%y', # '10/25/06'
# "%b %d %Y", # 'Oct 25 2006'
# "%b %d, %Y", # 'Oct 25, 2006'
# "%d %b %Y", # '25 Oct 2006'
# "%d %b, %Y", #'25 Oct, 2006'
# "%B %d %Y", # 'October 25 2006'
# "%B %d, %Y", #'October 25, 2006'
# "%d %B %Y", # '25 October 2006'
# "%d %B, %Y", # '25 October, 2006'
'%Y년 %m월 %d일', # '2006년 10월 25일', with localized suffix.
]
TIME_INPUT_FORMATS = [

4
django/conf/locale/lt/formats.py
View File

@ -14,7 +14,9 @@ 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 = [
'%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
'%Y-%m-%d', # '2006-10-25'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
]
TIME_INPUT_FORMATS = [
'%H:%M:%S', # '14:30:59'

4
django/conf/locale/lv/formats.py
View File

@ -15,7 +15,9 @@ FIRST_DAY_OF_WEEK = 1 # Monday
# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
'%Y-%m-%d', # '2006-10-25'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
]
TIME_INPUT_FORMATS = [
'%H:%M:%S', # '14:30:59'

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

@ -14,8 +14,10 @@ FIRST_DAY_OF_WEEK = 1
# 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', '%d.%m.%y', # '25.10.2006', '25.10.06'
'%d. %m. %Y', '%d. %m. %y', # '25. 10. 2006', '25. 10. 06'
'%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 = [

16
django/conf/locale/ml/formats.py
View File

@ -15,11 +15,17 @@ FIRST_DAY_OF_WEEK = 0 # Sunday
# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
# '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
# '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
# '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
# '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%Y-%m-%d', # '2006-10-25'
'%m/%d/%Y', # '10/25/2006'
'%m/%d/%y', # '10/25/06'
# "%b %d %Y", # 'Oct 25 2006'
# "%b %d, %Y", # 'Oct 25, 2006'
# "%d %b %Y", # '25 Oct 2006'
# "%d %b, %Y", # '25 Oct, 2006'
# "%B %d %Y", # 'October 25 2006'
# "%B %d, %Y", # 'October 25, 2006'
# "%d %B %Y", # '25 October 2006'
# "%d %B, %Y", # '25 October, 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

9
django/conf/locale/ms/formats.py
View File

@ -15,9 +15,12 @@ FIRST_DAY_OF_WEEK = 0 # Sunday
# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
DATE_INPUT_FORMATS = [
'%Y-%m-%d', # '2006-10-25'
'%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
'%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
'%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
'%d %b %Y', # '25 Oct 2006'
'%d %b, %Y', # '25 Oct, 2006'
'%d %B %Y', # '25 October 2006'
'%d %B, %Y', # '25 October, 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

13
django/conf/locale/nb/formats.py
View File

@ -15,10 +15,15 @@ FIRST_DAY_OF_WEEK = 1 # Monday
# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
# '%d. %b %Y', '%d %b %Y', # '25. okt 2006', '25 okt 2006'
# '%d. %b. %Y', '%d %b. %Y', # '25. okt. 2006', '25 okt. 2006'
# '%d. %B %Y', '%d %B %Y', # '25. oktober 2006', '25 oktober 2006'
'%Y-%m-%d', # '2006-10-25'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
# "%d. %b %Y", # '25. okt 2006'
# "%d %b %Y", # '25 okt 2006'
# "%d. %b. %Y", # '25. okt. 2006'
# "%d %b. %Y", # '25 okt. 2006'
# "%d. %B %Y", # '25. oktober 2006'
# "%d %B %Y", # '25 oktober 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

82
django/conf/locale/nl/formats.py
View File

@ -14,11 +14,15 @@ FIRST_DAY_OF_WEEK = 1 # Monday (in Dutch 'maandag')
# 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', '%d-%m-%y', # '20-01-2009', '20-01-09'
'%d/%m/%Y', '%d/%m/%y', # '20/01/2009', '20/01/09'
'%d-%m-%Y', # '20-01-2009'
'%d-%m-%y', # '20-01-09'
'%d/%m/%Y', # '20/01/2009'
'%d/%m/%y', # '20/01/09'
'%Y/%m/%d', # '2009/01/20'
# '%d %b %Y', '%d %b %y', # '20 jan 2009', '20 jan 09'
# '%d %B %Y', '%d %B %y', # '20 januari 2009', '20 januari 09'
# "%d %b %Y", # '20 jan 2009'
# "%d %b %y", # '20 jan 09'
# "%d %B %Y", # '20 januari 2009'
# "%d %B %y", # '20 januari 09'
]
# Kept ISO formats as one is in first position
TIME_INPUT_FORMATS = [
@ -31,35 +35,57 @@ TIME_INPUT_FORMATS = [
]
DATETIME_INPUT_FORMATS = [
# With time in %H:%M:%S :
'%d-%m-%Y %H:%M:%S', '%d-%m-%y %H:%M:%S', '%Y-%m-%d %H:%M:%S',
# '20-01-2009 15:23:35', '20-01-09 15:23:35', '2009-01-20 15:23:35'
'%d/%m/%Y %H:%M:%S', '%d/%m/%y %H:%M:%S', '%Y/%m/%d %H:%M:%S',
# '20/01/2009 15:23:35', '20/01/09 15:23:35', '2009/01/20 15:23:35'
# '%d %b %Y %H:%M:%S', '%d %b %y %H:%M:%S', # '20 jan 2009 15:23:35', '20 jan 09 15:23:35'
# '%d %B %Y %H:%M:%S', '%d %B %y %H:%M:%S', # '20 januari 2009 15:23:35', '20 januari 2009 15:23:35'
'%d-%m-%Y %H:%M:%S', # '20-01-2009 15:23:35'
'%d-%m-%y %H:%M:%S', # '20-01-09 15:23:35'
'%Y-%m-%d %H:%M:%S', # '2009-01-20 15:23:35'
'%d/%m/%Y %H:%M:%S', # '20/01/2009 15:23:35'
'%d/%m/%y %H:%M:%S', # '20/01/09 15:23:35'
'%Y/%m/%d %H:%M:%S', # '2009/01/20 15:23:35'
# "%d %b %Y %H:%M:%S", # '20 jan 2009 15:23:35'
# "%d %b %y %H:%M:%S", # '20 jan 09 15:23:35'
# "%d %B %Y %H:%M:%S", # '20 januari 2009 15:23:35'
# "%d %B %y %H:%M:%S", # '20 januari 2009 15:23:35'
# With time in %H:%M:%S.%f :
'%d-%m-%Y %H:%M:%S.%f', '%d-%m-%y %H:%M:%S.%f', '%Y-%m-%d %H:%M:%S.%f',
# '20-01-2009 15:23:35.000200', '20-01-09 15:23:35.000200', '2009-01-20 15:23:35.000200'
'%d/%m/%Y %H:%M:%S.%f', '%d/%m/%y %H:%M:%S.%f', '%Y/%m/%d %H:%M:%S.%f',
# '20/01/2009 15:23:35.000200', '20/01/09 15:23:35.000200', '2009/01/20 15:23:35.000200'
'%d-%m-%Y %H:%M:%S.%f', # '20-01-2009 15:23:35.000200'
'%d-%m-%y %H:%M:%S.%f', # '20-01-09 15:23:35.000200'
'%Y-%m-%d %H:%M:%S.%f', # '2009-01-20 15:23:35.000200'
'%d/%m/%Y %H:%M:%S.%f', # '20/01/2009 15:23:35.000200'
'%d/%m/%y %H:%M:%S.%f', # '20/01/09 15:23:35.000200'
'%Y/%m/%d %H:%M:%S.%f', # '2009/01/20 15:23:35.000200'
# With time in %H.%M:%S :
'%d-%m-%Y %H.%M:%S', '%d-%m-%y %H.%M:%S', # '20-01-2009 15.23:35', '20-01-09 15.23:35'
'%d/%m/%Y %H.%M:%S', '%d/%m/%y %H.%M:%S', # '20/01/2009 15.23:35', '20/01/09 15.23:35'
# '%d %b %Y %H.%M:%S', '%d %b %y %H.%M:%S', # '20 jan 2009 15.23:35', '20 jan 09 15.23:35'
# '%d %B %Y %H.%M:%S', '%d %B %y %H.%M:%S', # '20 januari 2009 15.23:35', '20 januari 2009 15.23:35'
'%d-%m-%Y %H.%M:%S', # '20-01-2009 15.23:35'
'%d-%m-%y %H.%M:%S', # '20-01-09 15.23:35'
'%d/%m/%Y %H.%M:%S', # '20/01/2009 15.23:35'
'%d/%m/%y %H.%M:%S', # '20/01/09 15.23:35'
# "%d %b %Y %H.%M:%S", # '20 jan 2009 15.23:35'
# "%d %b %y %H.%M:%S", # '20 jan 09 15.23:35'
# "%d %B %Y %H.%M:%S", # '20 januari 2009 15.23:35'
# "%d %B %y %H.%M:%S", # '20 januari 2009 15.23:35'
# With time in %H.%M:%S.%f :
'%d-%m-%Y %H.%M:%S.%f', '%d-%m-%y %H.%M:%S.%f', # '20-01-2009 15.23:35.000200', '20-01-09 15.23:35.000200'
'%d/%m/%Y %H.%M:%S.%f', '%d/%m/%y %H.%M:%S.%f', # '20/01/2009 15.23:35.000200', '20/01/09 15.23:35.000200'
'%d-%m-%Y %H.%M:%S.%f', # '20-01-2009 15.23:35.000200'
'%d-%m-%y %H.%M:%S.%f', # '20-01-09 15.23:35.000200'
'%d/%m/%Y %H.%M:%S.%f', # '20/01/2009 15.23:35.000200'
'%d/%m/%y %H.%M:%S.%f', # '20/01/09 15.23:35.000200'
# With time in %H:%M :
'%d-%m-%Y %H:%M', '%d-%m-%y %H:%M', '%Y-%m-%d %H:%M', # '20-01-2009 15:23', '20-01-09 15:23', '2009-01-20 15:23'
'%d/%m/%Y %H:%M', '%d/%m/%y %H:%M', '%Y/%m/%d %H:%M', # '20/01/2009 15:23', '20/01/09 15:23', '2009/01/20 15:23'
# '%d %b %Y %H:%M', '%d %b %y %H:%M', # '20 jan 2009 15:23', '20 jan 09 15:23'
# '%d %B %Y %H:%M', '%d %B %y %H:%M', # '20 januari 2009 15:23', '20 januari 2009 15:23'
'%d-%m-%Y %H:%M', # '20-01-2009 15:23'
'%d-%m-%y %H:%M', # '20-01-09 15:23'
'%Y-%m-%d %H:%M', # '2009-01-20 15:23'
'%d/%m/%Y %H:%M', # '20/01/2009 15:23'
'%d/%m/%y %H:%M', # '20/01/09 15:23'
'%Y/%m/%d %H:%M', # '2009/01/20 15:23'
# "%d %b %Y %H:%M", # '20 jan 2009 15:23'
# "%d %b %y %H:%M", # '20 jan 09 15:23'
# "%d %B %Y %H:%M", # '20 januari 2009 15:23'
# "%d %B %y %H:%M", # '20 januari 2009 15:23'
# With time in %H.%M :
'%d-%m-%Y %H.%M', '%d-%m-%y %H.%M', # '20-01-2009 15.23', '20-01-09 15.23'
'%d/%m/%Y %H.%M', '%d/%m/%y %H.%M', # '20/01/2009 15.23', '20/01/09 15.23'
# '%d %b %Y %H.%M', '%d %b %y %H.%M', # '20 jan 2009 15.23', '20 jan 09 15.23'
# '%d %B %Y %H.%M', '%d %B %y %H.%M', # '20 januari 2009 15.23', '20 januari 2009 15.23'
'%d-%m-%Y %H.%M', # '20-01-2009 15.23'
'%d-%m-%y %H.%M', # '20-01-09 15.23'
'%d/%m/%Y %H.%M', # '20/01/2009 15.23'
'%d/%m/%y %H.%M', # '20/01/09 15.23'
# "%d %b %Y %H.%M", # '20 jan 2009 15.23'
# "%d %b %y %H.%M", # '20 jan 09 15.23'
# "%d %B %Y %H.%M", # '20 januari 2009 15.23'
# "%d %B %y %H.%M", # '20 januari 2009 15.23'
]
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = '.'

13
django/conf/locale/nn/formats.py
View File

@ -15,10 +15,15 @@ FIRST_DAY_OF_WEEK = 1 # Monday
# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
# '%d. %b %Y', '%d %b %Y', # '25. okt 2006', '25 okt 2006'
# '%d. %b. %Y', '%d %b. %Y', # '25. okt. 2006', '25 okt. 2006'
# '%d. %B %Y', '%d %B %Y', # '25. oktober 2006', '25 oktober 2006'
'%Y-%m-%d', # '2006-10-25'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
# "%d. %b %Y", # '25. okt 2006'
# "%d %b %Y", # '25 okt 2006'
# "%d. %b. %Y", # '25. okt. 2006'
# "%d %b. %Y", # '25 okt. 2006'
# "%d. %B %Y", # '25. oktober 2006'
# "%d %B %Y", # '25 oktober 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

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

@ -14,9 +14,11 @@ 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', '%d.%m.%y', # '25.10.2006', '25.10.06'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
'%y-%m-%d', # '06-10-25'
# '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
# "%d. %B %Y", # '25. października 2006'
# "%d. %b. %Y", # '25. paź. 2006'
]
DATETIME_INPUT_FORMATS = [
'%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'

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

@ -15,9 +15,13 @@ FIRST_DAY_OF_WEEK = 0 # Sunday
# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
# Kept ISO formats as they are in first position
DATE_INPUT_FORMATS = [
'%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06'
# '%d de %b de %Y', '%d de %b, %Y', # '25 de Out de 2006', '25 Out, 2006'
# '%d de %B de %Y', '%d de %B, %Y', # '25 de Outubro de 2006', '25 de Outubro, 2006'
'%Y-%m-%d', # '2006-10-25'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
# "%d de %b de %Y", # '25 de Out de 2006'
# "%d de %b, %Y", # '25 Out, 2006'
# "%d de %B de %Y", # '25 de Outubro de 2006'
# "%d de %B, %Y", # '25 de Outubro, 2006'
]
DATETIME_INPUT_FORMATS = [
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'

9
django/conf/locale/pt_BR/formats.py
View File

@ -14,9 +14,12 @@ 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 = [
'%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
# '%d de %b de %Y', '%d de %b, %Y', # '25 de Out de 2006', '25 Out, 2006'
# '%d de %B de %Y', '%d de %B, %Y', # '25 de Outubro de 2006', '25 de Outubro, 2006'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
# "%d de %b de %Y", # '24 de Out de 2006'
# "%d de %b, %Y", # '25 Out, 2006'
# "%d de %B de %Y", # '25 de Outubro de 2006'
# "%d de %B, %Y", # '25 de Outubro, 2006'
]
DATETIME_INPUT_FORMATS = [
'%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'

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

@ -14,9 +14,11 @@ 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', '%d.%m.%y', # '25.10.2006', '25.10.06'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
'%y-%m-%d', # '06-10-25'
# '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006'
# "%d. %B %Y", # '25. October 2006'
# "%d. %b. %Y", # '25. Oct. 2006'
]
DATETIME_INPUT_FORMATS = [
'%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'

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

@ -14,9 +14,11 @@ FIRST_DAY_OF_WEEK = 0
# 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', '%d.%m.%y', # '25.10.2006', '25.10.06'
'%d.%m.%Y', # '25.10.2006'
'%d.%m.%y', # '25.10.06'
'%d-%m-%Y', # '25-10-2006'
'%d. %m. %Y', '%d. %m. %y', # '25. 10. 2006', '25. 10. 06'
'%d. %m. %Y', # '25. 10. 2006'
'%d. %m. %y', # '25. 10. 06'
]
DATETIME_INPUT_FORMATS = [

15
django/conf/locale/sr/formats.py
View File

@ -14,11 +14,16 @@ FIRST_DAY_OF_WEEK = 1
# 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.', '%d.%m.%y.', # '25.10.2006.', '25.10.06.'
'%d. %m. %Y.', '%d. %m. %y.', # '25. 10. 2006.', '25. 10. 06.'
# '%d. %b %y.', '%d. %B %y.', # '25. Oct 06.', '25. October 06.'
# '%d. %b \'%y.', '%d. %B \'%y.', # '25. Oct '06.', '25. October '06.'
# '%d. %b %Y.', '%d. %B %Y.', # '25. Oct 2006.', '25. October 2006.'
'%d.%m.%Y.', # '25.10.2006.'
'%d.%m.%y.', # '25.10.06.'
'%d. %m. %Y.', # '25. 10. 2006.'
'%d. %m. %y.', # '25. 10. 06.'
# "%d. %b %y.", # '25. Oct 06.'
# "%d. %B %y.", # '25. October 06.'
# "%d. %b '%y.", # '25. Oct '06.'
# "%d. %B '%y.", # '25. October '06.'
# "%d. %b %Y.", # '25. Oct 2006.'
# "%d. %B %Y.", # '25. October 2006.'
]
DATETIME_INPUT_FORMATS = [
'%d.%m.%Y. %H:%M:%S', # '25.10.2006. 14:30:59'

15
django/conf/locale/sr_Latn/formats.py
View File

@ -14,11 +14,16 @@ FIRST_DAY_OF_WEEK = 1
# 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.', '%d.%m.%y.', # '25.10.2006.', '25.10.06.'
'%d. %m. %Y.', '%d. %m. %y.', # '25. 10. 2006.', '25. 10. 06.'
# '%d. %b %y.', '%d. %B %y.', # '25. Oct 06.', '25. October 06.'
# '%d. %b \'%y.', '%d. %B \'%y.', # '25. Oct '06.', '25. October '06.'
# '%d. %b %Y.', '%d. %B %Y.', # '25. Oct 2006.', '25. October 2006.'
'%d.%m.%Y.', # '25.10.2006.'
'%d.%m.%y.', # '25.10.06.'
'%d. %m. %Y.', # '25. 10. 2006.'
'%d. %m. %y.', # '25. 10. 06.'
# "%d. %b %y.", # '25. Oct 06.'
# "%d. %B %y.", # '25. October 06.'
# "%d. %b '%y.", # '25. Oct '06.'
# "%d. %B '%y.", #'25. October '06.'
# "%d. %b %Y.", # '25. Oct 2006.'
# "%d. %B %Y.", # '25. October 2006.'
]
DATETIME_INPUT_FORMATS = [
'%d.%m.%Y. %H:%M:%S', # '25.10.2006. 14:30:59'

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

@ -14,9 +14,11 @@ FIRST_DAY_OF_WEEK = 1 # Pazartesi
# 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', '%d/%m/%y', # '25/10/2006', '25/10/06'
'%d/%m/%Y', # '25/10/2006'
'%d/%m/%y', # '25/10/06'
'%y-%m-%d', # '06-10-25'
# '%d %B %Y', '%d %b. %Y', # '25 Ekim 2006', '25 Eki. 2006'
# "%d %B %Y", # '25 Ekim 2006'
# "%d %b. %Y", # '25 Eki. 2006'
]
DATETIME_INPUT_FORMATS = [
'%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'

16
docs/ref/settings.txt
View File

@ -1111,11 +1111,17 @@ See also :setting:`DATETIME_FORMAT`, :setting:`TIME_FORMAT` and :setting:`SHORT_
Default::
[
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
'%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
'%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
'%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
'%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
'%Y-%m-%d', # '2006-10-25'
'%m/%d/%Y', # '10/25/2006'
'%m/%d/%y', # '10/25/06'
'%b %d %Y', # 'Oct 25 2006'
'%b %d, %Y', # 'Oct 25, 2006'
'%d %b %Y', # '25 Oct 2006'
'%d %b, %Y', # '25 Oct, 2006'
'%B %d %Y', # 'October 25 2006'
'%B %d, %Y', # 'October 25, 2006'
'%d %B %Y', # '25 October 2006'
'%d %B, %Y', # '25 October, 2006'
]
A list of formats that will be accepted when inputting data on a date field.