From 52e336d3d032ea841b372f3454184af1b0b59c9c Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Mon, 17 Oct 2005 22:33:08 +0000 Subject: [PATCH] i18n: fixed a problem with the object history and lazy translations of field names git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@918 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/text.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/utils/text.py b/django/utils/text.py index 0d6f20a7d6..6ac8352ac6 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -55,7 +55,7 @@ def get_text_list(list_, last_word='or'): """ if len(list_) == 0: return '' if len(list_) == 1: return list_[0] - return '%s %s %s' % (', '.join([i for i in list_][:-1]), last_word, list_[-1]) + return '%s %s %s' % (', '.join([str(i) for i in list_][:-1]), last_word, list_[-1]) def normalize_newlines(text): return re.sub(r'\r\n|\r|\n', '\n', text)