summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-11-15 10:06:37 +0200
committerTim Graham <timograham@gmail.com>2014-11-15 09:53:55 +0100
commit4f90c99635149fae2f488c03f0b52303fe97e0aa (patch)
treefa889e82ec0ba555bf813527d5adab889b928ad0
parentd552da1f8d42b7c6db992fee42bc4781f5fdde43 (diff)
Fixed #23665 -- Noted precedence of settings.USE_L10N in MONTH_DAY_FORMAT and YEAR_MONTH.
-rw-r--r--docs/ref/settings.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 90f6e1e147..58fc22eaa1 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1933,6 +1933,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`.
@@ -2617,6 +2620,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`.