Ticket #3017: commaseparate.2.patch

django/contrib/humanize/templatetags/humanize.py

@@ -18 +18 @@
     return '%d%s' % (value, t[value % 10])
 register.filter(ordinal)
 
-def intcomma(value):
+def commaseparate(value):
     """
-    Converts an integer to a string containing commas every three digits.
+    Converts an number to a string containing commas every three digits.
     For example, 3000 becomes '3,000' and 45000 becomes '45,000'.
     """
     orig = str(value)
-    new = re.sub("^(-?\d+)(\d{3})", '\g<1>,\g<2>', str(value))
+    new = re.sub("^(-?\d+)(\d{3})((?:\.\d+)?)", r'\1,\2\3', str(value))
     if orig == new:
         return new
     else:
-        return intcomma(new)
+        return commaseparate(new)
+register.filter(commaseparate)
+
+# Backwards compatibility (commaseparate used to be called intcomma).
+intcomma = commaseparate
 register.filter(intcomma)
 
 def intword(value):

docs/add_ons.txt

@@ -87 +87 @@
 
 You can pass in either an integer or a string representation of an integer.
 
-intcomma
---------
+commaseparate
+-------------
 
-Converts an integer to a string containing commas every three digits.
+**New in Django development version**: ``commaseparate`` (which was previously
+called ``intcomma``) now works with both integers and floating point numbers.
 
+Converts a number to a string containing commas every three digits (before any
+decimal place).
+
 Examples:
 
     * ``4500`` becomes ``'4,500'``.
     * ``45000`` becomes ``'45,000'``.
     * ``450000`` becomes ``'450,000'``.
     * ``4500000`` becomes ``'4,500,000'``.
+    * ``4500.0001`` becomes ``'4,500.0001'``.
 
-You can pass in either an integer or a string representation of an integer.
+You can pass in either an integer, a float or a string representation of an
+integer or float.
 
 intword
 -------