Django

Code

Changeset 6140

Show
Ignore:
Timestamp:
09/13/07 17:35:18 (1 year ago)
Author:
mtredinnick
Message:

Fixed #5370 -- Allow lazy translations in ValidationError? classes. Patch from James Bennett.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/newforms/util.py

    r5609 r6140  
    11from django.utils.html import escape 
    22from django.utils.encoding import smart_unicode, StrAndUnicode 
     3from django.utils.functional import Promise 
    34 
    45def flatatt(attrs): 
     
    4849            self.messages = ErrorList([smart_unicode(msg) for msg in message]) 
    4950        else: 
    50             assert isinstance(message, basestring), ("%s should be a basestring" % repr(message)) 
     51            assert isinstance(message, (basestring, Promise)), ("%s should be a basestring or lazy translation" % repr(message)) 
    5152            message = smart_unicode(message) 
    5253            self.messages = ErrorList([message])