Changeset 3272

Timestamp:

07/04/06 01:18:39 (2 years ago)

Author:

russellm

Message:

Fixes #2202 -- Added ability to customize output of pluralize filter to handle irregular cases (walrus/walruses, cherry/cherries). Thanks to gid for the suggestion and the initial patch

Files:

• django/trunk/django/template/defaultfilters.py (modified) (2 diffs)
• django/trunk/docs/templates.txt (modified) (1 diff)
• django/trunk/tests/othertests/defaultfilters.py (modified) (1 diff)

django/trunk/django/template/defaultfilters.py

@@ -431 +431 @@
-    return "%.1f GB" % (bytes / (1024 * 1024 * 1024))
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    try:
-        if int(value) != 1:
-'s'
+plural_suffix
-    except ValueError: # invalid string that's not a number
-        pass
@@ -441 +456 @@
-        try:
-            if len(value) != 1:
-'s'
+plural_suffix
-        except TypeError: # len() of unsized object
-            pass
-''
+singular_suffix
-
-def phone2numeric(value):

django/trunk/docs/templates.txt

@@ -952 +952 @@
-~~~~~~~~~
-
-``'s'`` if the value is not 1.
+a plural suffix if the value is not 1. By default, this suffix is ``'s'``. 
-
-Example::
-
-    You have {{ num_messages }} message{{ num_messages|pluralize }}.
+
+For words that require a suffix other than ``'s'``, you can provide an alternate 
+suffix as a parameter to the filter.
+
+Example::
+
+    You have {{ num_walruses }} walrus{{ num_walrus|pluralize:"es" }}.
+
+For words that don't pluralize by simple suffix, you can specify both a
+singular and plural suffix, separated by a comma.
+
+Example::
+
+    You have {{ num_cherries }} cherr{{ num_cherries|pluralize:"y,ies" }}.
-
-pprint

django/trunk/tests/othertests/defaultfilters.py

@@ -314 +314 @@
-'s'
-
+>>> pluralize([1])
+''
+
+>>> pluralize([])
+'s'
+
+>>> pluralize([1,2,3])
+'s'
+
+>>> pluralize(1,'es')
+''
+
+>>> pluralize(0,'es')
+'es'
+
+>>> pluralize(2,'es')
+'es'
+
+>>> pluralize(1,'y,ies')
+'y'
+
+>>> pluralize(0,'y,ies')
+'ies'
+
+>>> pluralize(2,'y,ies')
+'ies'
+
+>>> pluralize(0,'y,ies,error')
+''
+
->>> phone2numeric('0800 flowers')
-'0800 3569377'