summaryrefslogtreecommitdiff
path: root/tests/regressiontests
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-12-12 22:53:49 +0000
committerJannis Leidel <jannis@leidel.info>2010-12-12 22:53:49 +0000
commit462d3115a32ca2f2dfb28231495bc9a42e828e47 (patch)
tree0ed37cba4fad8db45384c8ddd6e66738550950f1 /tests/regressiontests
parent575962c213c7e6b7393c9ba43ecbb11389ff7c8b (diff)
Fixed #5672 -- Allow the separator in the get_text_list utility function to be translated. Thanks, Claude.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
-rw-r--r--tests/regressiontests/text/tests.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/regressiontests/text/tests.py b/tests/regressiontests/text/tests.py
index fd02036f99..3036f8ec2e 100644
--- a/tests/regressiontests/text/tests.py
+++ b/tests/regressiontests/text/tests.py
@@ -4,12 +4,23 @@ from django.test import TestCase
from django.utils.text import *
from django.utils.http import urlquote, urlquote_plus, cookie_date, http_date
from django.utils.encoding import iri_to_uri
+from django.utils.translation import activate, deactivate
class TextTests(TestCase):
"""
Tests for stuff in django.utils.text and other text munging util functions.
"""
+ def test_get_text_list(self):
+ self.assertEqual(get_text_list(['a', 'b', 'c', 'd']), u'a, b, c or d')
+ self.assertEqual(get_text_list(['a', 'b', 'c'], 'and'), u'a, b and c')
+ self.assertEqual(get_text_list(['a', 'b'], 'and'), u'a and b')
+ self.assertEqual(get_text_list(['a']), u'a')
+ self.assertEqual(get_text_list([]), u'')
+ activate('ar')
+ self.assertEqual(get_text_list(['a', 'b', 'c']), u"a، b أو c")
+ deactivate()
+
def test_smart_split(self):
self.assertEquals(list(smart_split(r'''This is "a person" test.''')),