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

    r7351 r7707  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99 
    1010class PEDepartmentSelect(Select): 
    …… 
    2121    """ 
    2222    default_error_messages = { 
    23         'invalid': ugettext("This field requires only numbers."), 
    24         'max_digits': ugettext("This field requires 8 digits."), 
     23        'invalid': _("This field requires only numbers."), 
     24        'max_digits': _("This field requires 8 digits."), 
    2525    } 
    2626 
    …… 
    4949    """ 
    5050    default_error_messages = { 
    51         'invalid': ugettext("This field requires only numbers."), 
    52         'max_digits': ugettext("This field requires 11 digits."), 
     51        'invalid': _("This field requires only numbers."), 
     52        'max_digits': _("This field requires 11 digits."), 
    5353    } 
    5454