diff --git a/django/conf/locale/en/formats.py b/django/conf/locale/en/formats.py
index c59a94a..b5ec639 100644
a
|
b
|
|
2 | 2 | # This file is distributed under the same license as the Django package. |
3 | 3 | # |
4 | 4 | |
| 5 | # FORMAT strings are using the Django date syntax |
| 6 | # http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date |
5 | 7 | DATE_FORMAT = 'N j, Y' |
6 | 8 | TIME_FORMAT = 'P' |
7 | 9 | DATETIME_FORMAT = 'N j, Y, P' |
… |
… |
MONTH_DAY_FORMAT = 'F j'
|
10 | 12 | SHORT_DATE_FORMAT = 'm/d/Y' |
11 | 13 | SHORT_DATETIME_FORMAT = 'm/d/Y P' |
12 | 14 | FIRST_DAY_OF_WEEK = 0 # Sunday |
| 15 | |
| 16 | # Input formats are using the python strftime syntax |
| 17 | # http://docs.python.org/library/datetime.html#strftime-strptime-behavior |
13 | 18 | DATE_INPUT_FORMATS = ( |
14 | 19 | '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06' |
15 | 20 | # '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006' |