Ticket #20122: defaultfilters_fix_pluralize.diff

django/template/defaultfilters.py

@@ -839 +839 @@
 @register.filter(is_safe=False)
 def pluralize(value, arg='s'):
     """
-    Returns a plural suffix if the value is not 1. By default, 's' is used as
-    the suffix:
+    Returns a singular suffix if the value is 1, '1' or an object of len 1,
+    plural suffix for different than 1, '1' or len != 1 and ''
+    if one cannot quantify the value in either singular or plural.
+    By default, 's' is used as the suffix:
 
     * If value is 0, vote{{ value|pluralize }} displays "0 votes".
     * If value is 1, vote{{ value|pluralize }} displays "1 vote".
@@ -867 +869 @@
         return ''
     singular_suffix, plural_suffix = bits[:2]
 
+    if value == 1 or value == '1':
+        return singular_suffix
     try:
-        if int(value) != 1:
-            return plural_suffix
-    except ValueError: # Invalid string that's not a number.
+        float(value)
+        return plural_suffix
+    except ValueError: # String that cannot be converted to a numerical value
         pass
-    except TypeError: # Value isn't a string or a number; maybe it's a list?
+    except TypeError: # Value isn't a string nor a number; maybe it's a list?
         try:
             if len(value) != 1:
                 return plural_suffix
-        except TypeError: # len() of unsized object.
+            else:
+                return singular_suffix
+        except TypeError: # Value is an unsized object
             pass
-    return singular_suffix
+    return ''
 
 @register.filter("phone2numeric", is_safe=True)
 def phone2numeric_filter(value):