Django

Code

Show
Ignore:
Timestamp:
06/19/08 11:04:52 (7 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7706].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7668 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7706

  • django/branches/newforms-admin/django/contrib/localflavor/ca/forms.py

    r7351 r7707  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.newforms.util import smart_unicode 
    8 from django.utils.translation import gettext, ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1515    """Canadian postal code field.""" 
    1616    default_error_messages = { 
    17         'invalid': gettext(u'Enter a postal code in the format XXX XXX.'), 
     17        'invalid': _(u'Enter a postal code in the format XXX XXX.'), 
    1818    } 
    1919 
    …… 
    8686    """ 
    8787    default_error_messages = { 
    88         'invalid': ugettext('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'), 
     88        'invalid': _('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'), 
    8989    } 
    9090