Django

Code

Changeset 7689

Show
Ignore:
Timestamp:
06/18/08 08:10:05 (3 months ago)
Author:
russellm
Message:

Fixed #7554 -- Modified contrib.localflavor to make use of ugettext, rather than ugettext. Thanks to msaelices for the report and patch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7294 r7689  
    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 

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

    r6926 r7689  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.newforms.util import smart_unicode 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1414    """Australian post code field.""" 
    1515    default_error_messages = { 
    16         'invalid': ugettext('Enter a 4 digit post code.'), 
     16        'invalid': _('Enter a 4 digit post code.'), 
    1717    } 
    1818 

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

    r6926 r7689  
    77from django.newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.encoding import smart_unicode 
    9 from django.utils.translation import ugettext as _ 
     9from django.utils.translation import ugettext_lazy as _ 
    1010import re 
    1111 

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

    r7294 r7689  
    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 

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

    r6926 r7689  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1414class CHZipCodeField(RegexField): 
    1515    default_error_messages = { 
    16         'invalid': ugettext('Enter a zip code in the format XXXX.'), 
     16        'invalid': _('Enter a zip code in the format XXXX.'), 
    1717    } 
    1818 
    …… 
    6262    """ 
    6363    default_error_messages = { 
    64         'invalid': ugettext('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'), 
     64        'invalid': _('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'), 
    6565    } 
    6666 

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

    r6926 r7689  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import RegexField, Select, EMPTY_VALUES 
    7 from django.utils.translation import ugettext 
     7from django.utils.translation import ugettext_lazy as _ 
    88from django.utils.encoding import smart_unicode 
    99 
    …… 
    2727    """ 
    2828    default_error_messages = { 
    29         'invalid': ugettext('Enter a valid Chilean RUT.'), 
    30         'strict': ugettext('Enter a valid Chilean RUT. The format is XX.XXX.XXX-X.'), 
    31         'checksum': ugettext('The Chilean RUT is not valid.'), 
     29        'invalid': _('Enter a valid Chilean RUT.'), 
     30        'strict': _('Enter a valid Chilean RUT. The format is XX.XXX.XXX-X.'), 
     31        'checksum': _('The Chilean RUT is not valid.'), 
    3232    } 
    3333 

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

    r6926 r7689  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    7 from django.utils.translation import ugettext 
     7from django.utils.translation import ugettext_lazy as _ 
    88import re 
    99 
    …… 
    1212class DEZipCodeField(RegexField): 
    1313    default_error_messages = { 
    14         'invalid': ugettext('Enter a zip code in the format XXXXX.'), 
     14        'invalid': _('Enter a zip code in the format XXXXX.'), 
    1515    } 
    1616    def __init__(self, *args, **kwargs): 
    …… 
    3939    """ 
    4040    default_error_messages = { 
    41         'invalid': ugettext('Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.'), 
     41        'invalid': _('Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.'), 
    4242    } 
    4343 

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

    r7294 r7689  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import RegexField, Select, EMPTY_VALUES 
    8 from django.utils.translation import ugettext as _ 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 

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

    r6926 r7689  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99 
    1010class FIZipCodeField(RegexField): 
    1111    default_error_messages = { 
    12         'invalid': ugettext('Enter a zip code in the format XXXXX.'), 
     12        'invalid': _('Enter a zip code in the format XXXXX.'), 
    1313    } 
    1414    def __init__(self, *args, **kwargs): 
    …… 
    2626class FISocialSecurityNumber(Field): 
    2727    default_error_messages = { 
    28         'invalid': ugettext('Enter a valid Finnish social security number.'), 
     28        'invalid': _('Enter a valid Finnish social security number.'), 
    2929    } 
    3030 

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

    r6926 r7689  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1313class FRZipCodeField(RegexField): 
    1414    default_error_messages = { 
    15         'invalid': ugettext('Enter a zip code in the format XXXXX.'), 
     15        'invalid': _('Enter a zip code in the format XXXXX.'), 
    1616    } 
    1717 

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

    r6926 r7689  
    66from django.newforms.fields import RegexField, EMPTY_VALUES 
    77from django.newforms.widgets import Select 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99from django.utils.encoding import smart_unicode 
    1010 
    …… 
    1515    """ 
    1616    default_error_messages = { 
    17         'invalid': ugettext('Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.'), 
    18         'checksum': ugettext(u'The Icelandic identification number is not valid.'), 
     17        'invalid': _('Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.'), 
     18        'checksum': _(u'The Icelandic identification number is not valid.'), 
    1919    } 
    2020 

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

    r7662 r7689  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    7 from django.utils.translation import ugettext 
     7from django.utils.translation import ugettext_lazy as _ 
    88from django.utils.encoding import smart_unicode 
    99from django.contrib.localflavor.it.util import ssn_check_digit, vat_number_check_digit 
    …… 
    1212class ITZipCodeField(RegexField): 
    1313    default_error_messages = { 
    14         'invalid': ugettext('Enter a valid zip code.'), 
     14        'invalid': _('Enter a valid zip code.'), 
    1515    } 
    1616    def __init__(self, *args, **kwargs): 
    …… 
    4141    """ 
    4242    default_error_messages = { 
    43         'invalid': ugettext(u'Enter a valid Social Security number.'), 
     43        'invalid': _(u'Enter a valid Social Security number.'), 
    4444    } 
    4545 
    …… 
    6666    """ 
    6767    default_error_messages = { 
    68         'invalid': ugettext(u'Enter a valid VAT number.'), 
     68        'invalid': _(u'Enter a valid VAT number.'), 
    6969    } 
    7070 

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

    r7131 r7689  
    55from django.core import validators 
    66from django.newforms import ValidationError 
    7 from django.utils.translation import ugettext 
     7from django.utils.translation import ugettext_lazy as _ 
    88from django.newforms.fields import RegexField, Select 
    99 
    …… 
    1515    """ 
    1616    default_error_messages = { 
    17         'invalid': ugettext('Enter a postal code in the format XXXXXXX or XXX-XXXX.'), 
     17        'invalid': _('Enter a postal code in the format XXXXXXX or XXX-XXXX.'), 
    1818    } 
    1919 

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

    r7294 r7689  
    77from django.newforms import ValidationError 
    88from django.newforms.fields import Field, Select, EMPTY_VALUES 
    9 from django.utils.translation import ugettext as _ 
     9from django.utils.translation import ugettext_lazy as _ 
    1010from django.utils.encoding import smart_unicode 
    1111 

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

    r6926 r7689  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99 
    1010class NOZipCodeField(RegexField): 
    1111    default_error_messages = { 
    12         'invalid': ugettext('Enter a zip code in the format XXXX.'), 
     12        'invalid': _('Enter a zip code in the format XXXX.'), 
    1313    } 
    1414 
    …… 
    3131    """ 
    3232    default_error_messages = { 
    33         'invalid': ugettext(u'Enter a valid Norwegian social security number.'), 
     33        'invalid': _(u'Enter a valid Norwegian social security number.'), 
    3434    } 
    3535 

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

    r7294 r7689  
    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 

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

    r6926 r7689  
    77from django.newforms import ValidationError 
    88from django.newforms.fields import Select, RegexField 
    9 from django.utils.translation import ugettext as _ 
     9from django.utils.translation import ugettext_lazy as _ 
    1010 
    1111class PLVoivodeshipSelect(Select): 

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

    r6926 r7689  
    44 
    55from django.newforms.fields import Select, RegexField 
    6 from django.utils.translation import ugettext 
     6from django.utils.translation import ugettext_lazy as _ 
    77 
    88class SKRegionSelect(Select): 
    …… 
    2828    """ 
    2929    default_error_messages = { 
    30         'invalid': ugettext(u'Enter a postal code in the format XXXXX or XXX XX.'), 
     30        'invalid': _(u'Enter a postal code in the format XXXXX or XXX XX.'), 
    3131    } 
    3232 

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

    r6952 r7689  
    77from django.newforms.fields import CharField, Select 
    88from django.newforms import ValidationError 
    9 from django.utils.translation import ugettext 
     9from django.utils.translation import ugettext_lazy as _ 
    1010 
    1111class UKPostcodeField(CharField): 
    …… 
    1919    """ 
    2020    default_error_messages = { 
    21         'invalid': ugettext(u'Enter a valid postcode.'), 
     21        'invalid': _(u'Enter a valid postcode.'), 
    2222    } 
    2323    outcode_pattern = '[A-PR-UWYZ]([0-9]{1,2}|([A-HIK-Y][0-9](|[0-9]|[ABEHMNPRVWXY]))|[0-9][A-HJKSTUW])' 

  • django/trunk/django/contrib/localflavor/uk/uk_regions.py

    r7294 r7689  
    66    Scottish regions: http://en.wikipedia.org/wiki/Regions_and_districts_of_Scotland 
    77""" 
    8 from django.utils.translation import ugettext as _ 
     8from django.utils.translation import ugettext_lazy as _ 
    99 
    1010ENGLAND_REGION_CHOICES = ( 

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

    r6926 r7689  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import ugettext 
     8from django.utils.translation import ugettext_lazy as _ 
    99import re 
    1010 
    …… 
    1414class USZipCodeField(RegexField): 
    1515    default_error_messages = { 
    16         'invalid': ugettext('Enter a zip code in the format XXXXX or XXXXX-XXXX.'), 
     16        'invalid': _('Enter a zip code in the format XXXXX or XXXXX-XXXX.'), 
    1717    } 
    1818 
    …… 
    5252    """ 
    5353    default_error_messages = { 
    54         'invalid': ugettext('Enter a valid U.S. Social Security number in XXX-XX-XXXX format.'), 
     54        'invalid': _('Enter a valid U.S. Social Security number in XXX-XX-XXXX format.'), 
    5555    } 
    5656