Changeset 6671 for django/trunk/django/contrib/humanize

Timestamp:

11/14/07 06:58:53 (1 year ago)

Author:

mtredinnick

Message:

Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359

See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.

Files:

• django/trunk/django/contrib/humanize/templatetags/humanize.py (modified) (4 diffs)

django/trunk/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)
-