diff options
| author | Jacob Walls <jacobtylerwalls@gmail.com> | 2020-10-11 23:34:32 -0400 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-10-13 10:36:46 +0200 |
| commit | ac6c4260074de43a978e5c6553ef89441e1d6748 (patch) | |
| tree | c87ab944899912a643447c519e2cf684a31d4720 /tests | |
| parent | e18156b6c35908f2a4026287b5225a6a4da8af1a (diff) | |
Fixed #20601 -- Allowed forcing format with thousand separators in floatformat filter.
Thanks Claude Paroz and Nick Pope for reviews.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/i18n/tests.py | 24 | ||||
| -rw-r--r-- | tests/template_tests/filter_tests/test_floatformat.py | 15 |
2 files changed, 39 insertions, 0 deletions
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index affda21fb4..99e6febb28 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -560,6 +560,14 @@ class FormattingTests(SimpleTestCase): self.assertEqual('des. 31, 2009, 8:50 p.m.', Template('{{ dt }}').render(self.ctxt)) self.assertEqual('66666.67', Template('{{ n|floatformat:2 }}').render(self.ctxt)) self.assertEqual('100000.0', Template('{{ f|floatformat }}').render(self.ctxt)) + self.assertEqual( + '66666.67', + Template('{{ n|floatformat:"2g" }}').render(self.ctxt), + ) + self.assertEqual( + '100000.0', + Template('{{ f|floatformat:"g" }}').render(self.ctxt), + ) self.assertEqual('10:15 a.m.', Template('{{ t|time:"TIME_FORMAT" }}').render(self.ctxt)) self.assertEqual('12/31/2009', Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(self.ctxt)) self.assertEqual( @@ -734,6 +742,14 @@ class FormattingTests(SimpleTestCase): self.assertEqual('31 de desembre de 2009 a les 20:50', Template('{{ dt }}').render(self.ctxt)) self.assertEqual('66666,67', Template('{{ n|floatformat:2 }}').render(self.ctxt)) self.assertEqual('100000,0', Template('{{ f|floatformat }}').render(self.ctxt)) + self.assertEqual( + '66.666,67', + Template('{{ n|floatformat:"2g" }}').render(self.ctxt), + ) + self.assertEqual( + '100.000,0', + Template('{{ f|floatformat:"g" }}').render(self.ctxt), + ) self.assertEqual('10:15', Template('{{ t|time:"TIME_FORMAT" }}').render(self.ctxt)) self.assertEqual('31/12/2009', Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(self.ctxt)) self.assertEqual( @@ -935,6 +951,14 @@ class FormattingTests(SimpleTestCase): self.assertEqual('Dec. 31, 2009, 8:50 p.m.', Template('{{ dt }}').render(self.ctxt)) self.assertEqual('66666.67', Template('{{ n|floatformat:2 }}').render(self.ctxt)) self.assertEqual('100000.0', Template('{{ f|floatformat }}').render(self.ctxt)) + self.assertEqual( + '66,666.67', + Template('{{ n|floatformat:"2g" }}').render(self.ctxt), + ) + self.assertEqual( + '100,000.0', + Template('{{ f|floatformat:"g" }}').render(self.ctxt), + ) self.assertEqual('12/31/2009', Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(self.ctxt)) self.assertEqual( '12/31/2009 8:50 p.m.', diff --git a/tests/template_tests/filter_tests/test_floatformat.py b/tests/template_tests/filter_tests/test_floatformat.py index 8ad7322af2..64d65f7dc4 100644 --- a/tests/template_tests/filter_tests/test_floatformat.py +++ b/tests/template_tests/filter_tests/test_floatformat.py @@ -2,6 +2,8 @@ from decimal import Decimal, localcontext from django.template.defaultfilters import floatformat from django.test import SimpleTestCase +from django.test.utils import override_settings +from django.utils import translation from django.utils.safestring import mark_safe from ..utils import setup @@ -58,6 +60,19 @@ class FunctionTests(SimpleTestCase): self.assertEqual(floatformat(1.5e-15, -20), '0.00000000000000150000') self.assertEqual(floatformat(1.00000000000000015, 16), '1.0000000000000002') + @override_settings(USE_L10N=True) + def test_force_grouping(self): + with translation.override('en'): + self.assertEqual(floatformat(10000, 'g'), '10,000') + self.assertEqual(floatformat(66666.666, '1g'), '66,666.7') + # Invalid suffix. + self.assertEqual(floatformat(10000, 'g2'), '10000') + with translation.override('de', deactivate=True): + self.assertEqual(floatformat(10000, 'g'), '10.000') + self.assertEqual(floatformat(66666.666, '1g'), '66.666,7') + # Invalid suffix. + self.assertEqual(floatformat(10000, 'g2'), '10000') + def test_zero_values(self): self.assertEqual(floatformat(0, 6), '0.000000') self.assertEqual(floatformat(0, 7), '0.0000000') |
