Fixed #5156 -- Added some translation calls to a couple of missed words. Based on a patch from dAniel hAhler.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5895 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -128,6 +128,7 @@ answer newbie questions, and generally made Django that much better:
     Owen Griffiths
     Espen Grindhaug <http://grindhaug.org/>
     Thomas Güttler <hv@tbz-pariv.de>
+    dAniel hAhler
     Brian Harring <ferringb@gmail.com>
     Brant Harris
     Hawkeye

django/core/validators.py

@@ -272,7 +272,7 @@ def hasNoProfanities(field_data, all_data):
         plural = len(words_seen)
         raise ValidationError, ungettext("Watch your mouth! The word %s is not allowed here.",
             "Watch your mouth! The words %s are not allowed here.", plural) % \
-            get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], 'and')
+            get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], _('and'))
 
 class AlwaysMatchesOtherField(object):
     def __init__(self, other_field_name, error_message=None):

django/utils/text.py

@@ -2,6 +2,7 @@ import re
 from django.conf import settings
 from django.utils.encoding import force_unicode
 from django.utils.functional import allow_lazy
+from django.utils.translation import ugettext_lazy
 
 # Capitalizes the first letter of a string.
 capfirst = lambda x: x and force_unicode(x)[0].upper() + force_unicode(x)[1:]
@@ -123,7 +124,7 @@ def get_valid_filename(s):
     return re.sub(r'[^-A-Za-z0-9_.]', '', s)
 get_valid_filename = allow_lazy(get_valid_filename, unicode)
 
-def get_text_list(list_, last_word=u'or'):
+def get_text_list(list_, last_word=ugettext_lazy(u'or')):
     """
     >>> get_text_list(['a', 'b', 'c', 'd'])
     'a, b, c or d'