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/ar/forms.py

    r7351 r7707  
    77from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.encoding import smart_unicode 
    9 from django.utils.translation import ugettext 
     9from django.utils.translation import ugettext_lazy as _ 
    1010 
    1111class ARProvinceSelect(Select): 
    …… 
    2525    """ 
    2626    default_error_messages = { 
    27         'invalid': ugettext("Enter a postal code in the format NNNN or ANNNNAAA."), 
     27        'invalid': _("Enter a postal code in the format NNNN or ANNNNAAA."), 
    2828    } 
    2929 
    …… 
    4747    """ 
    4848    default_error_messages = { 
    49         'invalid': ugettext("This field requires only numbers."), 
    50         'max_digits': ugettext("This field requires 7 or 8 digits."), 
     49        'invalid': _("This field requires only numbers."), 
     50        'max_digits': _("This field requires 7 or 8 digits."), 
    5151    } 
    5252 
    …… 
    7777    """ 
    7878    default_error_messages = { 
    79         'invalid': ugettext('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'), 
    80         'checksum': ugettext("Invalid CUIT."), 
     79        'invalid': _('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'), 
     80        'checksum': _("Invalid CUIT."), 
    8181    } 
    8282