diff options
| author | Georg Bauer <gb@hugo.westfalen.de> | 2005-10-17 22:33:08 +0000 |
|---|---|---|
| committer | Georg Bauer <gb@hugo.westfalen.de> | 2005-10-17 22:33:08 +0000 |
| commit | 52e336d3d032ea841b372f3454184af1b0b59c9c (patch) | |
| tree | ae670972a05f76cebd4c1d4e0b3bd463466b916f /django/utils | |
| parent | c63aae3cff0b8fec03c0b4c31d43830863ee5772 (diff) | |
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
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/text.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |