Commit 90d3af38 authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #19015 -- Removed ISO formats from localized formats.py 

ISO formats are automatically appended to the list of input
formats. Kept only when it is specified in first position, as it
has a special meaning in localize_input.
Thanks Bojan Mihelac for the report.
parent 349c4c37

django/conf/locale/ca/formats.py

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ DATE_INPUT_FORMATS = ( 
    # '31/12/2009', '31/12/09'

    '%d/%m/%Y', '%d/%m/%y'

)

TIME_INPUT_FORMATS = (

    # '14:30:59', '14:30'

    '%H:%M:%S', '%H:%M'

)

DATETIME_INPUT_FORMATS = (

    '%d/%m/%Y %H:%M:%S',

    '%d/%m/%Y %H:%M',

django/conf/locale/cs/formats.py

+1 −4
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ FIRST_DAY_OF_WEEK = 1 # Monday 
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'

    '%Y-%m-%d', '%y-%m-%d',     # '2006-01-05', '06-01-05'

    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'

)

# Kept ISO formats as one is in first position

TIME_INPUT_FORMATS = (

    '%H:%M:%S', # '04:30:59'

    '%H.%M',    # '04.30'
@@ -36,10 +36,7 @@ DATETIME_INPUT_FORMATS = ( 
    '%d. %m. %Y %H.%M',     # '05. 01. 2006 04.30'

    '%d. %m. %Y %H:%M',     # '05. 01. 2006 04:30'

    '%d. %m. %Y',           # '05. 01. 2006'

    '%Y-%m-%d %H:%M:%S',    # '2006-01-05 04:30:59'

    '%Y-%m-%d %H.%M',       # '2006-01-05 04.30'

    '%Y-%m-%d %H:%M',       # '2006-01-05 04:30'

    '%Y-%m-%d',             # '2006-01-05'

)

DECIMAL_SEPARATOR = ','

THOUSAND_SEPARATOR = '\xa0' # non-breaking space

django/conf/locale/da/formats.py

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ FIRST_DAY_OF_WEEK = 1 
DATE_INPUT_FORMATS = (

    '%d.%m.%Y',                         # '25.10.2006'

)

TIME_INPUT_FORMATS = (

    '%H:%M:%S',                         # '14:30:59'

    '%H:%M',                            # '14:30'

)

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'

django/conf/locale/de/formats.py

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ 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'

)

TIME_INPUT_FORMATS = (

    '%H:%M:%S', # '14:30:59'

    '%H:%M',    # '14:30'

)

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'

django/conf/locale/de_CH/formats.py

+0 −8
Original line number Diff line number Diff line
@@ -19,20 +19,12 @@ FIRST_DAY_OF_WEEK = 1 # Monday 
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior

DATE_INPUT_FORMATS = (

    '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'

    '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25'

    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'

)

TIME_INPUT_FORMATS = (

    '%H:%M:%S', # '14:30:59'

    '%H:%M',    # '14:30'

)

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'

    '%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',             # '2006-10-25'

)



# these are the separators for non-monetary numbers. For monetary numbers,