Django

Code

Changeset 5895

Show
Ignore:
Timestamp:
08/15/07 07:09:32 (1 year ago)
Author:
mtredinnick
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/AUTHORS

    r5880 r5895  
    129129    Espen Grindhaug <http://grindhaug.org/> 
    130130    Thomas Güttler <hv@tbz-pariv.de> 
     131    dAniel hAhler 
    131132    Brian Harring <ferringb@gmail.com> 
    132133    Brant Harris 

  • django/trunk/django/core/validators.py

    r5864 r5895  
    273273        raise ValidationError, ungettext("Watch your mouth! The word %s is not allowed here.", 
    274274            "Watch your mouth! The words %s are not allowed here.", plural) % \ 
    275             get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], 'and') 
     275            get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], _('and')) 
    276276 
    277277class AlwaysMatchesOtherField(object): 

  • django/trunk/django/utils/text.py

    r5609 r5895  
    33from django.utils.encoding import force_unicode 
    44from django.utils.functional import allow_lazy 
     5from django.utils.translation import ugettext_lazy 
    56 
    67# Capitalizes the first letter of a string. 
    …… 
    124125get_valid_filename = allow_lazy(get_valid_filename, unicode) 
    125126 
    126 def get_text_list(list_, last_word=u'or'): 
     127def get_text_list(list_, last_word=ugettext_lazy(u'or')): 
    127128    """ 
    128129    >>> get_text_list(['a', 'b', 'c', 'd'])