summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-22 08:50:47 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-22 08:50:47 +0000
commitd72f630fdb68feaa8db2052f508cedecf1603eb9 (patch)
tree7bd1fad592b082b2a608cc86ae0b3e5e53b0538c
parent0fc057c486f9e4ae122a1a53bca9e4f055c11004 (diff)
unicode: Documented the new iriencode filter and added a test to prove one of
my claims. git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/templates.txt10
-rw-r--r--tests/regressiontests/defaultfilters/tests.py2
2 files changed, 12 insertions, 0 deletions
diff --git a/docs/templates.txt b/docs/templates.txt
index 2f9f769b96..8fe4c82d43 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -1012,6 +1012,16 @@ right-most digit, 2 is the second-right-most digit, etc. Returns the original
value for invalid input (if input or argument is not an integer, or if argument
is less than 1). Otherwise, output is always an integer.
+iriencode
+~~~~~~~~~
+
+Converts an IRI (Internationalized Resource Identifier) to a string that is
+suitable for including in a URL. This is necessary if you are trying to use
+strings containing non-ASCII characters in a URL.
+
+You can use this filter after you have used the ``urlencode`` filter on a
+string, without harm.
+
join
~~~~
diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/regressiontests/defaultfilters/tests.py
index fb35448edb..d2335dd87b 100644
--- a/tests/regressiontests/defaultfilters/tests.py
+++ b/tests/regressiontests/defaultfilters/tests.py
@@ -117,6 +117,8 @@ u'jack%20%26%20jill'
u'1'
>>> iriencode(u'S\xf8r-Tr\xf8ndelag')
u'S%C3%B8r-Tr%C3%B8ndelag'
+>>> iriencode(urlencode(u'jack & jill'))
+u'jack%20%26%20jill'
>>> urlizetrunc(u'http://short.com/', 20)
u'<a href="http://short.com/" rel="nofollow">http://short.com/</a>'