mirror of
https://github.com/django/django.git
synced 2024-12-25 10:35:48 +00:00
Fixed #17440 -- Used a more natural default date format in the Italian locale. Thanks rm_ and tekNico.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
067352ec02
commit
e5999ce234
@ -16,8 +16,8 @@ FIRST_DAY_OF_WEEK = 1 # Lunedì
|
|||||||
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
|
# The *_INPUT_FORMATS strings use the Python strftime format syntax,
|
||||||
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
|
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
|
||||||
DATE_INPUT_FORMATS = (
|
DATE_INPUT_FORMATS = (
|
||||||
'%Y-%m-%d', '%Y/%m/%d', # '2008-10-25', '2008/10/25'
|
'%d/%m/%Y', '%Y/%m/%d', # '25/10/2006', '2008/10/25'
|
||||||
'%d-%m-%Y', '%d/%m/%Y', # '25-10-2006', '25/10/2006'
|
'%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', '%d/%m/%y', # '25-10-06', '25/10/06'
|
||||||
)
|
)
|
||||||
TIME_INPUT_FORMATS = (
|
TIME_INPUT_FORMATS = (
|
||||||
@ -25,6 +25,12 @@ TIME_INPUT_FORMATS = (
|
|||||||
'%H:%M', # '14:30'
|
'%H:%M', # '14:30'
|
||||||
)
|
)
|
||||||
DATETIME_INPUT_FORMATS = (
|
DATETIME_INPUT_FORMATS = (
|
||||||
|
'%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
|
||||||
|
'%d/%m/%Y %H:%M', # '25/10/2006 14:30'
|
||||||
|
'%d/%m/%Y', # '25/10/2006'
|
||||||
|
'%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59'
|
||||||
|
'%d/%m/%y %H:%M', # '25/10/06 14:30'
|
||||||
|
'%d/%m/%y', # '25/10/06'
|
||||||
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
|
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
|
||||||
'%Y-%m-%d %H:%M', # '2006-10-25 14:30'
|
'%Y-%m-%d %H:%M', # '2006-10-25 14:30'
|
||||||
'%Y-%m-%d', # '2006-10-25'
|
'%Y-%m-%d', # '2006-10-25'
|
||||||
@ -34,12 +40,6 @@ DATETIME_INPUT_FORMATS = (
|
|||||||
'%d-%m-%y %H:%M:%S', # '25-10-06 14:30:59'
|
'%d-%m-%y %H:%M:%S', # '25-10-06 14:30:59'
|
||||||
'%d-%m-%y %H:%M', # '25-10-06 14:30'
|
'%d-%m-%y %H:%M', # '25-10-06 14:30'
|
||||||
'%d-%m-%y', # '25-10-06'
|
'%d-%m-%y', # '25-10-06'
|
||||||
'%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
|
|
||||||
'%d/%m/%Y %H:%M', # '25/10/2006 14:30'
|
|
||||||
'%d/%m/%Y', # '25/10/2006'
|
|
||||||
'%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59'
|
|
||||||
'%d/%m/%y %H:%M', # '25/10/06 14:30'
|
|
||||||
'%d/%m/%y', # '25/10/06'
|
|
||||||
)
|
)
|
||||||
DECIMAL_SEPARATOR = ','
|
DECIMAL_SEPARATOR = ','
|
||||||
THOUSAND_SEPARATOR = '.'
|
THOUSAND_SEPARATOR = '.'
|
||||||
|
Loading…
Reference in New Issue
Block a user