mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Fixed #23665 -- Noted precedence of settings.USE_L10N in MONTH_DAY_FORMAT and YEAR_MONTH.

Browse Source 
Backport of 4f90c99635149fae2f488c03f0b52303fe97e0aa from master
This commit is contained in:
Berker Peksag 2014-11-15 10:06:37 +02:00 committed by Tim Graham
parent b050dc46a9
commit 3c2507c386
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/ref/settings.txt
View File

@ -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 locales have different formats. For example, U.S. English would say
"January 1," whereas Spanish might say "1 Enero." "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 See :tfilter:`allowed date format strings <date>`. See also
:setting:`DATE_FORMAT`, :setting:`DATETIME_FORMAT`, :setting:`DATE_FORMAT`, :setting:`DATETIME_FORMAT`,
:setting:`TIME_FORMAT` and :setting:`YEAR_MONTH_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 Different locales have different formats. For example, U.S. English would say
"January 2006," whereas another locale might say "2006/January." "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 See :tfilter:`allowed date format strings <date>`. See also
:setting:`DATE_FORMAT`, :setting:`DATETIME_FORMAT`, :setting:`TIME_FORMAT` :setting:`DATE_FORMAT`, :setting:`DATETIME_FORMAT`, :setting:`TIME_FORMAT`
and :setting:`MONTH_DAY_FORMAT`. and :setting:`MONTH_DAY_FORMAT`.