1 | Index: docs/ref/settings.txt
|
---|
2 | ===================================================================
|
---|
3 | --- docs/ref/settings.txt (revision 16537)
|
---|
4 | +++ docs/ref/settings.txt (working copy)
|
---|
5 | @@ -641,7 +641,8 @@
|
---|
6 | field. Formats will be tried in order, using the first valid.
|
---|
7 | Note that these format strings are specified in Python's datetime_ module
|
---|
8 | syntax, that is different from the one used by Django for formatting dates
|
---|
9 | -to be displayed.
|
---|
10 | +to be displayed. Also note that if :setting:`USE_L10N` is set to ``True``, then the
|
---|
11 | +locale-dictated format has higher precedence and will be applied instead.
|
---|
12 |
|
---|
13 | See also :setting:`DATETIME_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`.
|
---|
14 |
|
---|
15 | @@ -681,7 +682,8 @@
|
---|
16 | field. Formats will be tried in order, using the first valid.
|
---|
17 | Note that these format strings are specified in Python's datetime_ module
|
---|
18 | syntax, that is different from the one used by Django for formatting dates
|
---|
19 | -to be displayed.
|
---|
20 | +to be displayed. Also note that if :setting:`USE_L10N` is set to ``True``, then the
|
---|
21 | +locale-dictated format has higher precedence and will be applied instead.
|
---|
22 |
|
---|
23 | See also :setting:`DATE_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`.
|
---|
24 |
|
---|
25 | @@ -1880,7 +1882,8 @@
|
---|
26 | field. Formats will be tried in order, using the first valid.
|
---|
27 | Note that these format strings are specified in Python's datetime_ module
|
---|
28 | syntax, that is different from the one used by Django for formatting dates
|
---|
29 | -to be displayed.
|
---|
30 | +to be displayed. Also note that if :setting:`USE_L10N` is set to ``True``, then the
|
---|
31 | +locale-dictated format has higher precedence and will be applied instead.
|
---|
32 |
|
---|
33 | See also :setting:`DATE_INPUT_FORMATS` and :setting:`DATETIME_INPUT_FORMATS`.
|
---|
34 |
|
---|