[1.9.x] Fixed #25928 -- Clarified precendence of USE_THOUSAND_SEPARATOR and locale formats.

Backport of 7f218d98915ef3e76a98ef72075a6bde907dfe41 from master
This commit is contained in:
wingston sharon 2015-12-17 10:28:15 +04:00 committed by Tim Graham
parent 18bf062af9
commit abcf3fe684

View File

@ -2645,7 +2645,9 @@ Default: ``False``
A boolean that specifies whether to display numbers using a thousand separator.
When :setting:`USE_L10N` is set to ``True`` and if this is also set to
``True``, Django will use the values of :setting:`THOUSAND_SEPARATOR` and
:setting:`NUMBER_GROUPING` to format numbers.
:setting:`NUMBER_GROUPING` to format numbers unless the locale already has an
existing thousands separator. If there is a thousands separator in the locale
format, it will have higher precedence and will be applied instead.
See also :setting:`DECIMAL_SEPARATOR`, :setting:`NUMBER_GROUPING` and
:setting:`THOUSAND_SEPARATOR`.