diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-11-15 10:06:37 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-11-15 09:56:35 +0100 |
| commit | 159978e5c09b5e3cfbc1922a0890e030d9f52ae5 (patch) | |
| tree | 827b3985f117bbf67088d71b772023bb30d2b095 | |
| parent | f31e9c7a9d03626e753fdb2bb9457228d71d570f (diff) | |
[1.6.x] Fixed #23665 -- Noted precedence of settings.USE_L10N in MONTH_DAY_FORMAT and YEAR_MONTH.
Backport of 4f90c99635149fae2f488c03f0b52303fe97e0aa from master
| -rw-r--r-- | docs/ref/settings.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index bc67f76032..87e0c205fe 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1490,6 +1490,9 @@ drilldown, the header for a given day displays the day and month. Different locales have different formats. For example, U.S. English would say "January 1," whereas Spanish might say "1 Enero." +Note that if :setting:`USE_L10N` is set to ``True``, then the corresponding +locale-dictated format has higher precedence and will be applied. + See :tfilter:`allowed date format strings <date>`. See also :setting:`DATE_FORMAT`, :setting:`DATETIME_FORMAT`, :setting:`TIME_FORMAT` and :setting:`YEAR_MONTH_FORMAT`. @@ -2050,6 +2053,9 @@ drilldown, the header for a given month displays the month and the year. Different locales have different formats. For example, U.S. English would say "January 2006," whereas another locale might say "2006/January." +Note that if :setting:`USE_L10N` is set to ``True``, then the corresponding +locale-dictated format has higher precedence and will be applied. + See :tfilter:`allowed date format strings <date>`. See also :setting:`DATE_FORMAT`, :setting:`DATETIME_FORMAT`, :setting:`TIME_FORMAT` and :setting:`MONTH_DAY_FORMAT`. |