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:55:31 +0100 |
| commit | 3c2507c38629052ca9b266685b4763494b656947 (patch) | |
| tree | dbd7e8fb3e73934ffb380daad1e257f05c394d3e | |
| parent | b050dc46a9758e370c5b05ff25a133b741ffe465 (diff) | |
[1.7.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 603710d52b..bebeada90e 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1828,6 +1828,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`. @@ -2445,6 +2448,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`. |