diff options
| author | wingston sharon <wingston.sharon@gmail.com> | 2015-12-17 10:28:15 +0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-01-07 14:32:38 -0500 |
| commit | abcf3fe68410ff9ffdfe72df9e925efd044d6ff6 (patch) | |
| tree | 679f689b124c60a59e9c36c84946cbe53b42526e /docs/ref/settings.txt | |
| parent | 18bf062af9e0fc248fd6df3e689b63ff8d834602 (diff) | |
[1.9.x] Fixed #25928 -- Clarified precendence of USE_THOUSAND_SEPARATOR and locale formats.
Backport of 7f218d98915ef3e76a98ef72075a6bde907dfe41 from master
Diffstat (limited to 'docs/ref/settings.txt')
| -rw-r--r-- | docs/ref/settings.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index f034030101..2094ee74fb 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -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`. |