Changeset 3077

Timestamp:

06/03/06 20:03:48 (2 years ago)

Author:

adrian

Message:

Fixed #1684 -- Added apnumber template filter in django.contrib.humanize. Thanks, ubernostrum

Files:

• django/trunk/django/contrib/humanize/templatetags/humanize.py (modified) (1 diff)
• django/trunk/docs/add_ons.txt (modified) (2 diffs)

django/trunk/django/contrib/humanize/templatetags/humanize.py

@@ -49 +49 @@
-    return value
-register.filter(intword)
+
+def apnumber(value):
+    """
+    For numbers 1-9, returns the number spelled out. Otherwise, returns the
+    number. This follows Associated Press style.
+    """
+    try:
+        value = int(value)
+    except ValueError:
+        return value
+    if not 0 < value < 10:
+        return value
+    return ('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine')[value-1]
+register.filter(apnumber)

django/trunk/docs/add_ons.txt

@@ -54 +54 @@
-in a template, and you'll have access to these filters:
-
-
-
+
+-
-
-
+
+
-
-Examples:
-
-1st
-2nd
-3`` becomes ``'3rd'
+one
+two
+10`` becomes ``10
-
-You can pass in either an integer or a string representation of an integer.
@@ -94 +95 @@
-
-Values up to 1000000000000000 (one quadrillion) are supported.
+
+You can pass in either an integer or a string representation of an integer.
+
+ordinal
+-------
+
+Converts an integer to its ordinal as a string.
+
+Examples:
+
+    * ``1`` becomes ``'1st'``.
+    * ``2`` becomes ``'2nd'``.
+    * ``3`` becomes ``'3rd'``.
-
-You can pass in either an integer or a string representation of an integer.