From 0adfba968e28cfb4e4d681e658866debbbd68089 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 19 Jul 2018 22:44:40 +0200 Subject: Fixed #29578 -- Made numberformat.format() honor forced l10n usage. Thanks Sassan Haradji for the report. --- tests/utils_tests/test_numberformat.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tests/utils_tests') diff --git a/tests/utils_tests/test_numberformat.py b/tests/utils_tests/test_numberformat.py index 3b815adfb8..b78b37551d 100644 --- a/tests/utils_tests/test_numberformat.py +++ b/tests/utils_tests/test_numberformat.py @@ -1,11 +1,11 @@ from decimal import Decimal from sys import float_info -from unittest import TestCase +from django.test import SimpleTestCase from django.utils.numberformat import format as nformat -class TestNumberFormat(TestCase): +class TestNumberFormat(SimpleTestCase): def test_format_number(self): self.assertEqual(nformat(1234, '.'), '1234') @@ -14,6 +14,11 @@ class TestNumberFormat(TestCase): self.assertEqual(nformat(1234, '.', grouping=2, thousand_sep=','), '1234') self.assertEqual(nformat(1234, '.', grouping=2, thousand_sep=',', force_grouping=True), '12,34') self.assertEqual(nformat(-1234.33, '.', decimal_pos=1), '-1234.3') + # The use_l10n parameter can force thousand grouping behavior. + with self.settings(USE_THOUSAND_SEPARATOR=True, USE_L10N=True): + self.assertEqual(nformat(1234, '.', grouping=3, thousand_sep=',', use_l10n=False), '1234') + with self.settings(USE_THOUSAND_SEPARATOR=True, USE_L10N=False): + self.assertEqual(nformat(1234, '.', grouping=3, thousand_sep=',', use_l10n=True), '1,234') def test_format_string(self): self.assertEqual(nformat('1234', '.'), '1234') -- cgit v1.3