From 7f218d98915ef3e76a98ef72075a6bde907dfe41 Mon Sep 17 00:00:00 2001
From: wingston sharon <wingston.sharon@gmail.com>
Date: Thu, 17 Dec 2015 10:28:15 +0400
Subject: [PATCH] Fixed #25928 -- Clarified precendence of
 USE_THOUSAND_SEPARATOR and locale formats.

---
 docs/ref/settings.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index a6ac7896d18..a5abec51681 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2474,7 +2474,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`.