mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	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.
This commit is contained in:
		| @@ -19,10 +19,6 @@ DATE_INPUT_FORMATS = ( | |||||||
|     # '31/12/2009', '31/12/09' |     # '31/12/2009', '31/12/09' | ||||||
|     '%d/%m/%Y', '%d/%m/%y' |     '%d/%m/%Y', '%d/%m/%y' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     # '14:30:59', '14:30' |  | ||||||
|     '%H:%M:%S', '%H:%M' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%d/%m/%Y %H:%M:%S', |     '%d/%m/%Y %H:%M:%S', | ||||||
|     '%d/%m/%Y %H:%M', |     '%d/%m/%Y %H:%M', | ||||||
|   | |||||||
| @@ -19,9 +19,9 @@ FIRST_DAY_OF_WEEK = 1 # Monday | |||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%d.%m.%Y', '%d.%m.%y',     # '05.01.2006', '05.01.06' |     '%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. %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' |     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006' | ||||||
| ) | ) | ||||||
|  | # Kept ISO formats as one is in first position | ||||||
| TIME_INPUT_FORMATS = ( | TIME_INPUT_FORMATS = ( | ||||||
|     '%H:%M:%S', # '04:30:59' |     '%H:%M:%S', # '04:30:59' | ||||||
|     '%H.%M',    # '04.30' |     '%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 %H:%M',     # '05. 01. 2006 04:30' |     '%d. %m. %Y %H:%M',     # '05. 01. 2006 04:30' | ||||||
|     '%d. %m. %Y',           # '05. 01. 2006' |     '%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 %H:%M',       # '2006-01-05 04:30' |  | ||||||
|     '%Y-%m-%d',             # '2006-01-05' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = '\xa0' # non-breaking space | THOUSAND_SEPARATOR = '\xa0' # non-breaking space | ||||||
|   | |||||||
| @@ -18,10 +18,6 @@ FIRST_DAY_OF_WEEK = 1 | |||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%d.%m.%Y',                         # '25.10.2006' |     '%d.%m.%Y',                         # '25.10.2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',                         # '14:30:59' |  | ||||||
|     '%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:%S',                # '25.10.2006 14:30:59' | ||||||
|     '%d.%m.%Y %H:%M',                   # '25.10.2006 14:30' |     '%d.%m.%Y %H:%M',                   # '25.10.2006 14:30' | ||||||
|   | |||||||
| @@ -19,10 +19,6 @@ 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. October 2006', '25. Oct. 2006' |     # '%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 = ( | 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',       # '25.10.2006 14:30' |     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30' | ||||||
|   | |||||||
| @@ -19,20 +19,12 @@ FIRST_DAY_OF_WEEK = 1 # Monday | |||||||
| # 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 = ( | ||||||
|     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06' |     '%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' |     # '%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 = ( | 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',       # '25.10.2006 14:30' |     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30' | ||||||
|     '%d.%m.%Y',             # '25.10.2006' |     '%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, | # these are the separators for non-monetary numbers. For monetary numbers, | ||||||
|   | |||||||
| @@ -15,6 +15,7 @@ FIRST_DAY_OF_WEEK = 0 # Sunday | |||||||
|  |  | ||||||
| # 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 | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06' |     '%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' |     # '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006' | ||||||
| @@ -22,10 +23,6 @@ DATE_INPUT_FORMATS = ( | |||||||
|     # '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 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 %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',        # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|   | |||||||
| @@ -17,16 +17,11 @@ FIRST_DAY_OF_WEEK = 0                   # Sunday | |||||||
| # 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 = ( | ||||||
|     '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06' |     '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06' | ||||||
|     '%Y-%m-%d',                         # '2006-10-25' |  | ||||||
|     # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006' |     # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006' | ||||||
|     # '%d %b %Y', '%d %b, %Y',          # '25 Oct 2006', '25 Oct, 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' |     # '%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 %B %Y', '%d %B, %Y',          # '25 October 2006', '25 October, 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',                         # '14:30:59' |  | ||||||
|     '%H:%M',                            # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|   | |||||||
| @@ -19,10 +19,6 @@ DATE_INPUT_FORMATS = ( | |||||||
|     # '31/12/2009', '31/12/09' |     # '31/12/2009', '31/12/09' | ||||||
|     '%d/%m/%Y', '%d/%m/%y' |     '%d/%m/%Y', '%d/%m/%y' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     # '14:30:59', '14:30' |  | ||||||
|     '%H:%M:%S', '%H:%M' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%d/%m/%Y %H:%M:%S', |     '%d/%m/%Y %H:%M:%S', | ||||||
|     '%d/%m/%Y %H:%M', |     '%d/%m/%Y %H:%M', | ||||||
|   | |||||||
| @@ -19,10 +19,6 @@ DATE_INPUT_FORMATS = ( | |||||||
|     '%d/%m/%Y', # '31/12/2009' |     '%d/%m/%Y', # '31/12/2009' | ||||||
|     '%d/%m/%y', # '31/12/09' |     '%d/%m/%y', # '31/12/09' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S', # '14:30:59' |  | ||||||
|     '%H:%M',    # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%d/%m/%Y %H:%M:%S', |     '%d/%m/%Y %H:%M:%S', | ||||||
|     '%d/%m/%Y %H:%M', |     '%d/%m/%Y %H:%M', | ||||||
|   | |||||||
| @@ -15,9 +15,6 @@ 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' | ||||||
|     '%Y%m%d',                           # '20061025' |     '%Y%m%d',                           # '20061025' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S', '%H:%M',		# '14:30:59', '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%d/%m/%Y %H:%M:%S', |     '%d/%m/%Y %H:%M:%S', | ||||||
|     '%d/%m/%Y %H:%M', |     '%d/%m/%Y %H:%M', | ||||||
|   | |||||||
| @@ -15,9 +15,6 @@ DATE_INPUT_FORMATS = ( | |||||||
|     '%Y%m%d',                          	# '20061025' |     '%Y%m%d',                          	# '20061025' | ||||||
|  |  | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S', '%H:%M',		# '14:30:59', '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%d/%m/%Y %H:%M:%S', |     '%d/%m/%Y %H:%M:%S', | ||||||
|     '%d/%m/%Y %H:%M', |     '%d/%m/%Y %H:%M', | ||||||
|   | |||||||
| @@ -19,13 +19,8 @@ FIRST_DAY_OF_WEEK = 1 # Monday | |||||||
| DATE_INPUT_FORMATS = ( | 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', '%d.%m.%y', # Swiss (fr_CH), '25.10.2006', '25.10.06' |     '%d.%m.%Y', '%d.%m.%y', # Swiss (fr_CH), '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 octobre 2006', '25 oct. 2006' |     # '%d %B %Y', '%d %b %Y', # '25 octobre 2006', '25 oct. 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S', # '14:30:59' |  | ||||||
|     '%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:%S',    # '25/10/2006 14:30:59' | ||||||
|     '%d/%m/%Y %H:%M',       # '25/10/2006 14:30' |     '%d/%m/%Y %H:%M',       # '25/10/2006 14:30' | ||||||
| @@ -33,9 +28,6 @@ DATETIME_INPUT_FORMATS = ( | |||||||
|     '%d.%m.%Y %H:%M:%S',    # Swiss (fr_CH), '25.10.2006 14:30:59' |     '%d.%m.%Y %H:%M:%S',    # Swiss (fr_CH), '25.10.2006 14:30:59' | ||||||
|     '%d.%m.%Y %H:%M',       # Swiss (fr_CH), '25.10.2006 14:30' |     '%d.%m.%Y %H:%M',       # Swiss (fr_CH), '25.10.2006 14:30' | ||||||
|     '%d.%m.%Y',             # Swiss (fr_CH), '25.10.2006' |     '%d.%m.%Y',             # Swiss (fr_CH), '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' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = '\xa0' # non-breaking space | THOUSAND_SEPARATOR = '\xa0' # non-breaking space | ||||||
|   | |||||||
| @@ -15,15 +15,12 @@ FIRST_DAY_OF_WEEK = 1 | |||||||
|  |  | ||||||
| # 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 | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d',                     # '2006-10-25' |     '%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.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.' |     '%d. %m. %Y.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',        # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|   | |||||||
| @@ -20,10 +20,6 @@ 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', '%d/%m/%y',  # '25-10-06', '25/10/06' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%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:%S',     # '25/10/2006 14:30:59' | ||||||
|     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30' |     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30' | ||||||
|   | |||||||
| @@ -15,16 +15,13 @@ 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, | ||||||
| # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior | # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',     # '2006-10-25', '10/25/2006', '10/25/06' |     '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',     # '2006-10-25', '10/25/2006', '10/25/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', '%d %b. %Y',   # '25 Oct 2006', '25 Oct, 2006', '25 Oct. 2006' | ||||||
|     # '%d %B %Y', '%d %B, %Y',                # '25 October 2006', '25 October, 2006' |     # '%d %B %Y', '%d %B, %Y',                # '25 October 2006', '25 October, 2006' | ||||||
|     # '%d.%m.%Y', '%d.%m.%y',                 # '25.10.2006', '25.10.06' |     # '%d.%m.%Y', '%d.%m.%y',                 # '25.10.2006', '25.10.06' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',        # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|   | |||||||
| @@ -16,6 +16,7 @@ SHORT_DATETIME_FORMAT = 'Y-n-j H:i' | |||||||
|  |  | ||||||
| # 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 | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06' |     '%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' |     # '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006' | ||||||
|   | |||||||
| @@ -16,6 +16,7 @@ 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, | ||||||
| # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior | # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' |     '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -18,12 +18,6 @@ FIRST_DAY_OF_WEEK = 1 | |||||||
| DATE_INPUT_FORMATS = ( | 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.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.' |     '%d. %m. %Y.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.' | ||||||
|     '%Y-%m-%d',                     # '2006-10-25' |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',        # '14:30' |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
| @@ -39,9 +33,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.' | ||||||
|     '%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' |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
|   | |||||||
| @@ -15,6 +15,7 @@ FIRST_DAY_OF_WEEK = 0 # Sunday | |||||||
|  |  | ||||||
| # 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 | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06' |     '%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' |     # '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006' | ||||||
| @@ -22,10 +23,6 @@ DATE_INPUT_FORMATS = ( | |||||||
|     # '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 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 %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',        # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|   | |||||||
| @@ -16,22 +16,17 @@ 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, | ||||||
| # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior | # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' |     '%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. %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. 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' |     # '%d. %B %Y', '%d %B %Y',            # '25. oktober 2006', '25 oktober 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',     # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|     '%Y-%m-%d',              # '2006-10-25' |  | ||||||
|     '%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',        # '25.10.2006 14:30' |     '%d.%m.%Y %H:%M',        # '25.10.2006 14:30' | ||||||
|     '%d.%m.%Y',              # '25.10.2006' |     '%d.%m.%Y',              # '25.10.2006' | ||||||
|   | |||||||
| @@ -16,10 +16,11 @@ FIRST_DAY_OF_WEEK = 1                   # Monday (in Dutch 'maandag') | |||||||
| # 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 = ( | ||||||
|     '%d-%m-%Y', '%d-%m-%y', '%Y-%m-%d', # '20-01-2009', '20-01-09', '2009-01-20' |     '%d-%m-%Y', '%d-%m-%y',             # '20-01-2009', '20-01-09' | ||||||
|     # '%d %b %Y', '%d %b %y',           # '20 jan 2009', '20 jan 09' |     # '%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', '%d %B %y',           # '20 januari 2009', '20 januari 09' | ||||||
| ) | ) | ||||||
|  | # Kept ISO formats as one is in first position | ||||||
| TIME_INPUT_FORMATS = ( | TIME_INPUT_FORMATS = ( | ||||||
|     '%H:%M:%S',                         # '15:23:35' |     '%H:%M:%S',                         # '15:23:35' | ||||||
|     '%H.%M:%S',                         # '15.23:35' |     '%H.%M:%S',                         # '15.23:35' | ||||||
|   | |||||||
| @@ -16,17 +16,13 @@ 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, | ||||||
| # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior | # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' |     '%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. %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. 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' |     # '%d. %B %Y', '%d %B %Y',            # '25. oktober 2006', '25 oktober 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',     # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|   | |||||||
| @@ -18,20 +18,13 @@ FIRST_DAY_OF_WEEK = 1 # Monday | |||||||
| # 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 = ( | ||||||
|     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06' |     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06' | ||||||
|     '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25' |     '%y-%m-%d',                 # '06-10-25' | ||||||
|     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006' |     # '%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 = ( | 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',       # '25.10.2006 14:30' |     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30' | ||||||
|     '%d.%m.%Y',             # '25.10.2006' |     '%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' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = ' ' | THOUSAND_SEPARATOR = ' ' | ||||||
|   | |||||||
| @@ -15,15 +15,12 @@ FIRST_DAY_OF_WEEK = 0  # Sunday | |||||||
|  |  | ||||||
| # 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 | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06' |     '%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 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 de %B de %Y', '%d de %B, %Y',   # '25 de Outubro de 2006', '25 de Outubro, 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',        # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|   | |||||||
| @@ -17,14 +17,10 @@ FIRST_DAY_OF_WEEK = 0  # Sunday | |||||||
| # 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 = ( | ||||||
|     '%d/%m/%Y', '%d/%m/%y', '%Y-%m-%d', # '25/10/2006', '25/10/06', '2006-10-25' |     '%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 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 de %B de %Y', '%d de %B, %Y',   # '25 de Outubro de 2006', '25 de Outubro, 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%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:%S',     # '25/10/2006 14:30:59' | ||||||
|     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30' |     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30' | ||||||
| @@ -32,9 +28,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' | ||||||
|     '%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' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = '.' | THOUSAND_SEPARATOR = '.' | ||||||
|   | |||||||
| @@ -19,11 +19,6 @@ 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' | ||||||
|     '%Y-%m-%d',  # '2006-10-25' |  | ||||||
| ) |  | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',  # '14:30:59' |  | ||||||
|     '%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:%S',  # '25.10.2006 14:30:59' | ||||||
| @@ -32,9 +27,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' | ||||||
|     '%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' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = '\xa0' # non-breaking space | THOUSAND_SEPARATOR = '\xa0' # non-breaking space | ||||||
|   | |||||||
| @@ -18,20 +18,13 @@ FIRST_DAY_OF_WEEK = 1 # Monday | |||||||
| # 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 = ( | ||||||
|     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06' |     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06' | ||||||
|     '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25' |     '%y-%m-%d',                 # '06-10-25' | ||||||
|     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006' |     # '%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 = ( | 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',       # '25.10.2006 14:30' |     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30' | ||||||
|     '%d.%m.%Y',             # '25.10.2006' |     '%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' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = '\xa0' # non-breaking space | THOUSAND_SEPARATOR = '\xa0' # non-breaking space | ||||||
|   | |||||||
| @@ -21,11 +21,6 @@ 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' | ||||||
| ) | ) | ||||||
|  |  | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%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:%S',            # '25.10.2006 14:30:59' | ||||||
|     '%d.%m.%Y %H:%M',               # '25.10.2006 14:30' |     '%d.%m.%Y %H:%M',               # '25.10.2006 14:30' | ||||||
|   | |||||||
| @@ -18,15 +18,10 @@ FIRST_DAY_OF_WEEK = 1 | |||||||
| DATE_INPUT_FORMATS = ( | 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.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.' |     '%d. %m. %Y.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.' | ||||||
|     '%Y-%m-%d',                     # '2006-10-25' |  | ||||||
|     # '%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 '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. %b %Y.', '%d. %B %Y.',     # '25. Oct 2006.', '25. October 2006.' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%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:%S',     # '25.10.2006. 14:30:59' | ||||||
|     '%d.%m.%Y. %H:%M',        # '25.10.2006. 14:30' |     '%d.%m.%Y. %H:%M',        # '25.10.2006. 14:30' | ||||||
| @@ -40,9 +35,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.' | ||||||
|     '%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' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = '.' | THOUSAND_SEPARATOR = '.' | ||||||
|   | |||||||
| @@ -18,15 +18,10 @@ FIRST_DAY_OF_WEEK = 1 | |||||||
| DATE_INPUT_FORMATS = ( | 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.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.' |     '%d. %m. %Y.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.' | ||||||
|     '%Y-%m-%d',                     # '2006-10-25' |  | ||||||
|     # '%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 '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. %b %Y.', '%d. %B %Y.',     # '25. Oct 2006.', '25. October 2006.' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%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:%S',     # '25.10.2006. 14:30:59' | ||||||
|     '%d.%m.%Y. %H:%M',        # '25.10.2006. 14:30' |     '%d.%m.%Y. %H:%M',        # '25.10.2006. 14:30' | ||||||
| @@ -40,9 +35,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.' | ||||||
|     '%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' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = '.' | THOUSAND_SEPARATOR = '.' | ||||||
|   | |||||||
| @@ -16,15 +16,12 @@ FIRST_DAY_OF_WEEK = 1 | |||||||
|  |  | ||||||
| # 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 | ||||||
|  | # Kept ISO formats as they are in first position | ||||||
| DATE_INPUT_FORMATS = ( | DATE_INPUT_FORMATS = ( | ||||||
|     '%Y-%m-%d',              # '2006-10-25' |     '%Y-%m-%d',              # '2006-10-25' | ||||||
|     '%m/%d/%Y',              # '10/25/2006' |     '%m/%d/%Y',              # '10/25/2006' | ||||||
|     '%m/%d/%y',              # '10/25/06' |     '%m/%d/%y',              # '10/25/06' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S',     # '14:30:59' |  | ||||||
|     '%H:%M',        # '14:30' |  | ||||||
| ) |  | ||||||
| DATETIME_INPUT_FORMATS = ( | DATETIME_INPUT_FORMATS = ( | ||||||
|     '%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' | ||||||
|   | |||||||
| @@ -17,20 +17,13 @@ FIRST_DAY_OF_WEEK = 1 # Pazartesi | |||||||
| # 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 = ( | ||||||
|     '%d/%m/%Y', '%d/%m/%y',     # '25/10/2006', '25/10/06' |     '%d/%m/%Y', '%d/%m/%y',     # '25/10/2006', '25/10/06' | ||||||
|     '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25' |     '%y-%m-%d',                 # '06-10-25' | ||||||
|     # '%d %B %Y', '%d %b. %Y',  # '25 Ekim 2006', '25 Eki. 2006' |     # '%d %B %Y', '%d %b. %Y',  # '25 Ekim 2006', '25 Eki. 2006' | ||||||
| ) | ) | ||||||
| TIME_INPUT_FORMATS = ( |  | ||||||
|     '%H:%M:%S', # '14:30:59' |  | ||||||
|     '%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:%S',    # '25/10/2006 14:30:59' | ||||||
|     '%d/%m/%Y %H:%M',       # '25/10/2006 14:30' |     '%d/%m/%Y %H:%M',       # '25/10/2006 14:30' | ||||||
|     '%d/%m/%Y',             # '25/10/2006' |     '%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' |  | ||||||
| ) | ) | ||||||
| DECIMAL_SEPARATOR = ',' | DECIMAL_SEPARATOR = ',' | ||||||
| THOUSAND_SEPARATOR = '.' | THOUSAND_SEPARATOR = '.' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user