summaryrefslogtreecommitdiff
path: root/docs/ref/forms
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2012-09-07 19:49:38 -0400
committerTim Graham <timograham@gmail.com>2012-09-07 19:50:55 -0400
commit7e8483e70b8180277b6ea99c1315ede7d887ce85 (patch)
treefc76d3e9e9cd6e421f03ff090b9841c00aed03bb /docs/ref/forms
parent376a18993b7d4f7de82c8fa82c0be32961d9f397 (diff)
[1.4.X] Fixed #18490 - Updated DateField input formats; thanks dloewenherz for the draft patch.
Backport of fa8fb2b383 from master
Diffstat (limited to 'docs/ref/forms')
-rw-r--r--docs/ref/forms/fields.txt20
1 files changed, 15 insertions, 5 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index fc8665b252..d83f781dc7 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -404,11 +404,21 @@ For each field, we describe the default widget used if you don't specify
If no ``input_formats`` argument is provided, the default input formats are::
- '%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'
- '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 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'
+ '%Y-%m-%d', # '2006-10-25'
+ '%m/%d/%Y', # '10/25/2006'
+ '%m/%d/%y', # '10/25/06'
+
+ Additionally, if you specify :setting:`USE_L10N=False<USE_L10N>` in your settings, the
+ following will also be included in the default input formats::
+
+ '%b %m %d', # 'Oct 25 2006'
+ '%b %d, %Y', # 'Oct 25, 2006'
+ '%d %b %Y', # '25 Oct 2006'
+ '%d %b, %Y', # '25 Oct, 2006'
+ '%B %d %Y', # 'October 25 2006'
+ '%B %d, %Y', # 'October 25, 2006'
+ '%d %B %Y', # '25 October 2006'
+ '%d %B, %Y', # '25 October, 2006'
``DateTimeField``
~~~~~~~~~~~~~~~~~