mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-22 02:02:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merged i18n branch into the trunk! Fixes #65, and perhaps some others. NB: this means that the i18n branch is now obsolete and will be made read-only.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2005-11-04 04:59:46 +00:00
parent cb45fd0ae2
commit 5cf8f68423
60 changed files with 12449 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django/utils/text.py
View file

@ -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)