mirror of https://github.com/django/django.git
Fixed #23665 -- Noted precedence of settings.USE_L10N in MONTH_DAY_FORMAT and YEAR_MONTH.
This commit is contained in:
parent
d552da1f8d
commit
4f90c99635
|
@ -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
|
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`.
|
||||||
|
@ -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
|
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`.
|
||||||
|
|
Loading…
Reference in New Issue