Changeset 6672 for django/branches/gis/django/contrib/humanize

Timestamp:

11/14/07 13:13:37 (1 year ago)

Author:

jbronn

Message:

gis: Merged revisions 6614-6671 via svnmerge from trunk.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/contrib/humanize/templatetags/humanize.py (modified) (4 diffs)

django/branches/gis/django/contrib/humanize/templatetags/humanize.py

@@ -22 +22 @@
-        return u"%d%s" % (value, t[0])
-    return u'%d%s' % (value, t[value % 10])
+ordinal.is_safe = True
-register.filter(ordinal)
-
@@ -35 +36 @@
-    else:
-        return intcomma(new)
+intcomma.is_safe = True
-register.filter(intcomma)
-
@@ -56 +58 @@
-        return ungettext('%(value).1f trillion', '%(value).1f trillion', new_value) % {'value': new_value}
-    return value
+intword.is_safe = False
-register.filter(intword)
-
@@ -70 +73 @@
-        return value
-    return (_('one'), _('two'), _('three'), _('four'), _('five'), _('six'), _('seven'), _('eight'), _('nine'))[value-1]
+apnumber.is_safe = True
-register.filter(apnumber)
-