summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/conf/locale/ar/LC_MESSAGES/django.mobin68894 -> 68957 bytes
-rw-r--r--django/conf/locale/ar/LC_MESSAGES/django.po5
-rw-r--r--django/utils/text.py7
3 files changed, 10 insertions, 2 deletions
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo
index 77bc44da15..9234d63ce3 100644
--- a/django/conf/locale/ar/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ar/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.po b/django/conf/locale/ar/LC_MESSAGES/django.po
index 28e2153032..2095a35873 100644
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/django/conf/locale/ar/LC_MESSAGES/django.po
@@ -5022,6 +5022,11 @@ msgstr "ديسمبر"
msgid "or"
msgstr "أو"
+#. Translators: This string is used as a separator between list elements
+#: utils/text.py:153
+msgid ", "
+msgstr "، "
+
#: utils/timesince.py:21
msgid "year"
msgid_plural "years"
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):