diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-12-12 22:53:49 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-12-12 22:53:49 +0000 |
| commit | 462d3115a32ca2f2dfb28231495bc9a42e828e47 (patch) | |
| tree | 0ed37cba4fad8db45384c8ddd6e66738550950f1 /django/utils/text.py | |
| parent | 575962c213c7e6b7393c9ba43ecbb11389ff7c8b (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 'django/utils/text.py')
| -rw-r--r-- | django/utils/text.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/django/utils/text.py b/django/utils/text.py index b05460486d..00c999c5d5 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -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): |