diff options
| author | Vladimír Macek <macek@sandbox.cz> | 2012-11-24 19:16:17 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-11-24 21:33:59 +0100 |
| commit | a12db81135b56a9d33b369c47b79a61d8dbbf268 (patch) | |
| tree | e7ae459314e9d61858fed53d703872f1699e355c | |
| parent | 75bc081b917d98a8f51201a2b26ce3a8f5dd4d62 (diff) | |
[1.5.x] Fixed #19293 -- Updated Czech input formats
Thanks vzima for the report.
Backport of abd0e76d2 from master.
| -rw-r--r-- | django/conf/locale/cs/formats.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/django/conf/locale/cs/formats.py b/django/conf/locale/cs/formats.py index f0b674227b..0b7e4c1ac9 100644 --- a/django/conf/locale/cs/formats.py +++ b/django/conf/locale/cs/formats.py @@ -17,21 +17,29 @@ FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, # 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.%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' ) TIME_INPUT_FORMATS = ( - '%H:%M:%S', # '14:30:59' - '%H:%M', # '14:30' + '%H:%M:%S', # '04:30:59' + '%H.%M', # '04.30' + '%H:%M', # '04: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' + '%d.%m.%Y %H:%M:%S', # '05.01.2006 04:30:59' + '%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 %H:%M:%S', # '05. 01. 2006 04:30:59' + '%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 |