innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #16452 -- Clarified that the DATE/DATETIME/TIME_INPUT_FORMATS settings have no effect when USE_L10N is True. Thanks Travis Brooks. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2012-02-19 08:00:06 +00:00
parent 0fe4218427
commit 7a7ec73efe
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
docs/ref/settings.txt
View File

@ -697,11 +697,13 @@ Default::
'%b %d, %Y', '%d %b %Y', '%d %b, %Y', '%B %d %Y', '%b %d, %Y', '%d %b %Y', '%d %b, %Y', '%B %d %Y',
'%B %d, %Y', '%d %B %Y', '%d %B, %Y') '%B %d, %Y', '%d %B %Y', '%d %B, %Y')
A tuple of formats that will be accepted when inputting data on a date A tuple of formats that will be accepted when inputting data on a date field.
field. Formats will be tried in order, using the first valid. Formats will be tried in order, using the first valid. Note that these format
Note that these format strings are specified in Python's datetime_ module strings are specified in Python's datetime_ module syntax, that is different
syntax, that is different from the one used by Django for formatting dates from the one used by Django for formatting dates to be displayed.
to be displayed.
When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher
precedence and will be applied instead.
See also :setting:`DATETIME_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`. See also :setting:`DATETIME_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`.
@ -738,10 +740,12 @@ Default::
'%m/%d/%y %H:%M:%S', '%m/%d/%y %H:%M', '%m/%d/%y') '%m/%d/%y %H:%M:%S', '%m/%d/%y %H:%M', '%m/%d/%y')
A tuple of formats that will be accepted when inputting data on a datetime A tuple of formats that will be accepted when inputting data on a datetime
field. Formats will be tried in order, using the first valid. field. Formats will be tried in order, using the first valid. Note that these
Note that these format strings are specified in Python's datetime_ module format strings are specified in Python's datetime_ module syntax, that is
syntax, that is different from the one used by Django for formatting dates different from the one used by Django for formatting dates to be displayed.
to be displayed.
When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher
precedence and will be applied instead.
See also :setting:`DATE_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`. See also :setting:`DATE_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`.
@ -2038,11 +2042,13 @@ TIME_INPUT_FORMATS
Default: ``('%H:%M:%S', '%H:%M')`` Default: ``('%H:%M:%S', '%H:%M')``
A tuple of formats that will be accepted when inputting data on a time A tuple of formats that will be accepted when inputting data on a time field.
field. Formats will be tried in order, using the first valid. Formats will be tried in order, using the first valid. Note that these format
Note that these format strings are specified in Python's datetime_ module strings are specified in Python's datetime_ module syntax, that is different
syntax, that is different from the one used by Django for formatting dates from the one used by Django for formatting dates to be displayed.
to be displayed.
When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher
precedence and will be applied instead.
See also :setting:`DATE_INPUT_FORMATS` and :setting:`DATETIME_INPUT_FORMATS`. See also :setting:`DATE_INPUT_FORMATS` and :setting:`DATETIME_INPUT_FORMATS`.