Ticket #2202: optional_arguments_to_pluralize.patch

django/template/defaultfilters.py

@@ -430 +430 @@
         return "%.1f MB" % (bytes / (1024 * 1024))
     return "%.1f GB" % (bytes / (1024 * 1024 * 1024))
 
-def pluralize(value):
+def pluralize(value, arg='s'):
     "Returns 's' if the value is not 1, for '1 vote' vs. '2 votes'"
+    if not ',' in arg:
+        arg = arg + ','
+    plural, single = arg.split(',', 1)
     try:
         if int(value) != 1:
-            return 's'
+            return plural
     except ValueError: # invalid string that's not a number
         pass
     except TypeError: # value isn't a string or a number; maybe it's a list?
         try:
             if len(value) != 1:
-                return 's'
+                return plural
         except TypeError: # len() of unsized object
             pass
-    return ''
+    return single
 
 def phone2numeric(value):
     "Takes a phone number and converts it in to its numerical equivalent"

docs/templates.txt

@@ -953 +953 @@
 
 Returns ``'s'`` if the value is not 1.
 
-Example::
+Use the optional argument to give an alternate plural. You can also add
+the singlar alternative with a comma: ``"knives,knife"``
+ 
+Examples::
 
     You have {{ num_messages }} message{{ num_messages|pluralize }}.
+    
+    Managed by {{ bosses }} boss{{ bosses|pluralize:"es" }}.
+    
+    I know {{ female_count }} {{ female_count|pluralize:"women,woman" }}.
 
 pprint
 ~~~~~~

tests/othertests/defaultfilters.py

@@ -313 +313 @@
 >>> pluralize(2)
 's'
 
+>>> pluralize(2, 'es')
+'es'
+
+>>> pluralize(1, 'men,man')
+'man'
+
+>>> pluralize(5, 'men,man')
+'men'
+
 >>> phone2numeric('0800 flowers')
 '0800 3569377'