Django

Code

Show
Ignore:
Timestamp:
07/04/07 07:11:04 (2 years ago)
Author:
mtredinnick
Message:

Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk

    • Property svnmerge-integrated set to /django/trunk:1-5600

  • django/trunk/django/contrib/localflavor/is_/forms.py

    r5210 r5609  
    66from django.newforms.fields import RegexField, EMPTY_VALUES 
    77from django.newforms.widgets import Select 
    8 from django.utils.translation import gettext 
     8from django.utils.translation import ugettext 
     9from django.utils.encoding import smart_unicode 
    910 
    1011class ISIdNumberField(RegexField): 
    …… 
    1415    """ 
    1516    def __init__(self, *args, **kwargs): 
    16         error_msg = gettext(u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.') 
     17        error_msg = ugettext('Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.') 
    1718        kwargs['min_length'],kwargs['max_length'] = 10,11 
    1819        super(ISIdNumberField, self).__init__(r'^\d{6}(-| )?\d{4}$', error_message=error_msg, *args, **kwargs) 
    …… 
    2829            return self._format(value) 
    2930        else: 
    30             raise ValidationError(gettext(u'The Icelandic identification number is not valid.')) 
     31            raise ValidationError(ugettext(u'The Icelandic identification number is not valid.')) 
    3132 
    3233    def _canonify(self, value): 
    …… 
    4950        display format. 
    5051        """ 
    51         return value[:6]+'-'+value[6:] 
     52        return smart_unicode(value[:6]+'-'+value[6:]) 
    5253 
    5354class ISPhoneNumberField(RegexField):