mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #22798 -- pluralize() now adds plural_suffix for any 1 < d < 2

Browse Source 
Thanks Odd_Bloke for the report.
This commit is contained in:
Moayad Mardini 2014-06-10 21:28:32 +03:00 committed by Tim Graham
parent f97c53c098
commit 868ff4e37c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/defaultfilters.py
View File

@ -934,7 +934,7 @@ def pluralize(value, arg='s'):
singular_suffix, plural_suffix = bits[:2] singular_suffix, plural_suffix = bits[:2]
try: try:
if int(value) != 1: if float(value) != 1:
return plural_suffix return plural_suffix
except ValueError: # Invalid string that's not a number. except ValueError: # Invalid string that's not a number.
pass pass

5
tests/defaultfilters/tests.py
View File

@ -654,6 +654,11 @@ class DefaultFiltersTests(TestCase):
self.assertEqual(pluralize(1), '') self.assertEqual(pluralize(1), '')
self.assertEqual(pluralize(0), 's') self.assertEqual(pluralize(0), 's')
self.assertEqual(pluralize(2), 's') self.assertEqual(pluralize(2), 's')
# Ticket #22798
self.assertEqual(pluralize(0.5), 's')
self.assertEqual(pluralize(1.5), 's')
self.assertEqual(pluralize(decimal.Decimal(1)), '') self.assertEqual(pluralize(decimal.Decimal(1)), '')
self.assertEqual(pluralize(decimal.Decimal(0)), 's') self.assertEqual(pluralize(decimal.Decimal(0)), 's')
self.assertEqual(pluralize(decimal.Decimal(2)), 's') self.assertEqual(pluralize(decimal.Decimal(2)), 's')