mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-23 18:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #5672 -- Allow the separator in the get_text_list utility function to be translated. Thanks, Claude.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2010-12-12 22:53:49 +00:00
parent 575962c213
commit 462d3115a3
4 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
django/utils/text.py
View file

@ -1,7 +1,7 @@
import re
from django.utils.encoding import force_unicode
from django.utils.functional import allow_lazy
from django.utils.translation import ugettext_lazy
from django.utils.translation import ugettext_lazy, ugettext as _
from htmlentitydefs import name2codepoint
# Capitalizes the first letter of a string.
@ -148,7 +148,10 @@ def get_text_list(list_, last_word=ugettext_lazy(u'or')):
"""
if len(list_) == 0: return u''
if len(list_) == 1: return force_unicode(list_[0])
return u'%s %s %s' % (', '.join([force_unicode(i) for i in list_][:-1]), force_unicode(last_word), force_unicode(list_[-1]))
return u'%s %s %s' % (
# Translators: This string is used as a separator between list elements
_(', ').join([force_unicode(i) for i in list_][:-1]),
force_unicode(last_word), force_unicode(list_[-1]))
get_text_list = allow_lazy(get_text_list, unicode)
def normalize_newlines(text):