Django

Code

Changeset 5229

Show
Ignore:
Timestamp:
05/14/07 06:24:37 (1 year ago)
Author:
mtredinnick
Message:

unicode: Replaced remaining uses in Python code of gettext() with ugettext().
Similarly for ngettext, gettext_lazy and ngettext_lazy.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/unicode/django/contrib/admin/models.py

    r5200 r5229  
    22from django.contrib.contenttypes.models import ContentType 
    33from django.contrib.auth.models import User 
    4 from django.utils.translation import gettext_lazy as _ 
     4from django.utils.translation import ugettext_lazy as _ 
    55 
    66ADDITION = 1 

  • django/branches/unicode/django/contrib/admin/views/decorators.py

    r5126 r5229  
    44from django.contrib.auth import authenticate, login 
    55from django.shortcuts import render_to_response 
    6 from django.utils.translation import gettext_lazy 
     6from django.utils.translation import ugettext_lazy 
    77import base64, datetime, md5 
    88import cPickle as pickle 
    99 
    10 ERROR_MESSAGE = gettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.") 
     10ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.") 
    1111LOGIN_FORM_KEY = 'this_is_the_login_form' 
    1212 

  • django/branches/unicode/django/contrib/auth/forms.py

    r4482 r5229  
    55from django.core import validators 
    66from django import oldforms 
    7 from django.utils.translation import gettext as _ 
     7from django.utils.translation import ugettext as _ 
    88 
    99class UserCreationForm(oldforms.Manipulator): 

  • django/branches/unicode/django/contrib/comments/models.py

    r4873 r5229  
    33from django.contrib.sites.models import Site 
    44from django.contrib.auth.models import User 
    5 from django.utils.translation import gettext_lazy as _ 
     5from django.utils.translation import ugettext_lazy as _ 
    66from django.conf import settings 
    77import datetime 

  • django/branches/unicode/django/contrib/comments/views/comments.py

    r5126 r5229  
    1212from django.utils.text import normalize_newlines 
    1313from django.conf import settings 
    14 from django.utils.translation import ngettext 
     14from django.utils.translation import ungettext, ugettext as _ 
    1515import base64, datetime 
    1616 
    …… 
    109109        # send the comment to the managers. 
    110110        if self.user_cache.comment_set.count() <= settings.COMMENTS_FIRST_FEW: 
    111             message = ngettext('This comment was posted by a user who has posted fewer than %(count)s comment:\n\n%(text)s', 
     111            message = ungettext('This comment was posted by a user who has posted fewer than %(count)s comment:\n\n%(text)s', 
    112112                'This comment was posted by a user who has posted fewer than %(count)s comments:\n\n%(text)s', settings.COMMENTS_FIRST_FEW) % \ 
    113113                {'count': settings.COMMENTS_FIRST_FEW, 'text': c.get_as_text()} 

  • django/branches/unicode/django/contrib/contenttypes/models.py

    r5059 r5229  
    11from django.db import models 
    2 from django.utils.translation import gettext_lazy as _ 
     2from django.utils.translation import ugettext_lazy as _ 
    33 
    44CONTENT_TYPE_CACHE = {} 
    …… 
    2020            CONTENT_TYPE_CACHE[key] = ct 
    2121        return ct 
    22          
     22 
    2323    def clear_cache(self): 
    2424        """ 

  • django/branches/unicode/django/contrib/flatpages/models.py

    r5059 r5229  
    22from django.db import models 
    33from django.contrib.sites.models import Site 
    4 from django.utils.translation import gettext_lazy as _ 
     4from django.utils.translation import ugettext_lazy as _ 
    55 
    66class FlatPage(models.Model): 

  • django/branches/unicode/django/contrib/humanize/templatetags/humanize.py

    r4856 r5229  
    1 from django.utils.translation import ngettext 
    2 from django.utils.translation import gettext_lazy as _ 
     1from django.utils.translation import ungettext, ugettext_lazy as _ 
    32from django import template 
    43import re 
    …… 
    4544    if value < 1000000000: 
    4645        new_value = value / 1000000.0 
    47         return ngettext('%(value).1f million', '%(value).1f million', new_value) % {'value': new_value} 
     46        return ungettext('%(value).1f million', '%(value).1f million', new_value) % {'value': new_value} 
    4847    if value < 1000000000000: 
    4948        new_value = value / 1000000000.0 
    50         return ngettext('%(value).1f billion', '%(value).1f billion', new_value) % {'value': new_value} 
     49        return ungettext('%(value).1f billion', '%(value).1f billion', new_value) % {'value': new_value} 
    5150    if value < 1000000000000000: 
    5251        new_value = value / 1000000000000.0 
    53         return ngettext('%(value).1f trillion', '%(value).1f trillion', new_value) % {'value': new_value} 
     52        return ungettext('%(value).1f trillion', '%(value).1f trillion', new_value) % {'value': new_value} 
    5453    return value 
    5554register.filter(intword) 

  • django/branches/unicode/django/contrib/localflavor/au/forms.py

    r4973 r5229  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.newforms.util import smart_unicode 
    8 from django.utils.translation import gettext 
     8from django.utils.translation import ugettext 
    99import re 
    1010 
    …… 
    1616        super(AUPostCodeField, self).__init__(r'^\d{4}$', 
    1717            max_length=None, min_length=None, 
    18             error_message=gettext(u'Enter a 4 digit post code.'), 
     18            error_message=ugettext(u'Enter a 4 digit post code.'), 
    1919            *args, **kwargs) 
    2020 

  • django/branches/unicode/django/contrib/localflavor/br/forms.py

    r5126 r5229  
    77from django.newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES 
    88from django.utils.encoding import smart_unicode 
    9 from django.utils.translation import gettext 
     9from django.utils.translation import ugettext 
    1010import re 
    1111 
    …… 
    1616        super(BRZipCodeField, self).__init__(r'^\d{5}-\d{3}$', 
    1717            max_length=None, min_length=None, 
    18             error_message=gettext('Enter a zip code in the format XXXXX-XXX.'), 
     18            error_message=ugettext('Enter a zip code in the format XXXXX-XXX.'), 
    1919            *args, **kwargs) 
    2020 
    …… 
    2828        if m: 
    2929            return u'%s-%s-%s' % (m.group(1), m.group(2), m.group(3)) 
    30         raise ValidationError(gettext(u'Phone numbers must be in XX-XXXX-XXXX format.')) 
     30        raise ValidationError(ugettext(u'Phone numbers must be in XX-XXXX-XXXX format.')) 
    3131 
    3232class BRStateSelect(Select): 
    …… 
    7070            int(value) 
    7171        except ValueError: 
    72             raise ValidationError(gettext("This field requires only numbers.")) 
     72            raise ValidationError(ugettext("This field requires only numbers.")) 
    7373        if len(value) != 11: 
    74             raise ValidationError(gettext("This field requires at most 11 digits or 14 characters.")) 
     74            raise ValidationError(ugettext("This field requires at most 11 digits or 14 characters.")) 
    7575        orig_dv = value[-2:] 
    7676 
    …… 
    8282        value = value[:-1] + str(new_2dv) 
    8383        if value[-2:] != orig_dv: 
    84             raise ValidationError(gettext("Invalid CPF number.")) 
     84            raise ValidationError(ugettext("Invalid CPF number.")) 
    8585 
    8686        return orig_value 
    …… 
    104104        if len(value) != 14: 
    105105            raise ValidationError( 
    106                 gettext("This field requires at least 14 digits")) 
     106                ugettext("This field requires at least 14 digits")) 
    107107        orig_dv = value[-2:] 
    108108 
    …… 
    114114        value = value[:-1] + str(new_2dv) 
    115115        if value[-2:] != orig_dv: 
    116             raise ValidationError(gettext("Invalid CNPJ number.")) 
     116            raise ValidationError(ugettext("Invalid CNPJ number.")) 
    117117 
    118118        return orig_value 

  • django/branches/unicode/django/contrib/localflavor/ch/ch_states.py

    r5151 r5229  
    11# -*- coding: utf-8 -* 
    2 from django.utils.translation import gettext_lazy as _ 
     2from django.utils.translation import ugettext_lazy as _ 
    33 
    44STATE_CHOICES = ( 

  • django/branches/unicode/django/contrib/localflavor/ch/forms.py

    r5151 r5229  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import gettext 
     8from django.utils.translation import ugettext 
    99import re 
    1010 
    …… 
    1616        super(CHZipCodeField, self).__init__(r'^\d{4}$', 
    1717        max_length=None, min_length=None, 
    18         error_message=gettext('Enter a zip code in the format XXXX.'), 
     18        error_message=ugettext('Enter a zip code in the format XXXX.'), 
    1919        *args, **kwargs) 
    2020 
    …… 
    8888    def clean(self, value): 
    8989        super(CHIdentityCardNumberField, self).clean(value) 
    90         error_msg = gettext('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.') 
     90        error_msg = ugettext('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.') 
    9191        if value in EMPTY_VALUES: 
    9292            return u'' 

  • django/branches/unicode/django/contrib/localflavor/cl/forms.py

    r5126 r5229  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import RegexField, EMPTY_VALUES 
    7 from django.utils.translation import gettext 
     7from django.utils.translation import ugettext 
    88 
    99class CLRutField(RegexField): 
    …… 
    1919            del kwargs['strict'] 
    2020            super(CLRutField, self).__init__(r'^(\d{1,2}\.)?\d{3}\.\d{3}-[\dkK]$', 
    21                 error_message=gettext('Enter valid a Chilean RUT. The format is XX.XXX.XXX-X.'), 
     21                error_message=ugettext('Enter valid a Chilean RUT. The format is XX.XXX.XXX-X.'), 
    2222                *args, **kwargs) 
    2323        else: 
    2424            # In non-strict mode, accept RUTs that validate but do not exist in 
    2525            # the real world. 
    26             super(CLRutField, self).__init__(r'^[\d\.]{1,11}-?[\dkK]$', error_message=gettext(u'Enter valid a Chilean RUT'), *args, **kwargs) 
     26            super(CLRutField, self).__init__(r'^[\d\.]{1,11}-?[\dkK]$', error_message=ugettext(u'Enter valid a Chilean RUT'), *args, **kwargs) 
    2727 
    2828    def clean(self, value): 

  • django/branches/unicode/django/contrib/localflavor/de/de_states.py

    r4926 r5229  
    11# -*- coding: utf-8 -* 
    2 from django.utils.translation import gettext_lazy as _ 
     2from django.utils.translation import ugettext_lazy as _ 
    33 
    44STATE_CHOICES = ( 

  • django/branches/unicode/django/contrib/localflavor/de/forms.py

    r4939 r5229  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    7 from django.utils.translation import gettext 
     7from django.utils.translation import ugettext 
    88import re 
    99 
    …… 
    1414        super(DEZipCodeField, self).__init__(r'^\d{5}$', 
    1515            max_length=None, min_length=None, 
    16             error_message=gettext(u'Enter a zip code in the format XXXXX.'), 
     16            error_message=ugettext(u'Enter a zip code in the format XXXXX.'), 
    1717            *args, **kwargs) 
    1818 
    …… 
    5858    def clean(self, value): 
    5959        super(DEIdentityCardNumberField, self).clean(value) 
    60         error_msg = gettext(u'Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.') 
     60        error_msg = ugettext(u'Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.') 
    6161        if value in EMPTY_VALUES: 
    6262            return u'' 

  • django/branches/unicode/django/contrib/localflavor/fi/forms.py

    r4973 r5229  
    66from django.newforms import ValidationError 
    77from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    8 from django.utils.translation import gettext 
     8from django.utils.translation import ugettext 
    99 
    1010class FIZipCodeField(RegexField): 
    …… 
    1212        super(FIZipCodeField, self).__init__(r'^\d{5}$', 
    1313            max_length=None, min_length=None, 
    14             error_message=gettext(u'Enter a zip code in the format XXXXX.'), 
     14            error_message=ugettext(u'Enter a zip code in the format XXXXX.'), 
    1515            *args, **kwargs) 
    1616 
    …… 
    3838            (?P<checksum>[%s])$""" % checkmarks, value, re.VERBOSE | re.IGNORECASE) 
    3939        if not result: 
    40             raise ValidationError(gettext(u'Enter a valid Finnish social security number.')) 
     40            raise ValidationError(ugettext(u'Enter a valid Finnish social security number.')) 
    4141        gd = result.groupdict() 
    4242        checksum = int(gd['date'] + gd['serial']) 
    4343        if checkmarks[checksum % len(checkmarks)] == gd['checksum'].upper(): 
    4444            return u'%s' % value.upper() 
    45         raise ValidationError(gettext(u'Enter a valid Finnish social security number.')) 
     45        raise ValidationError(ugettext(u'Enter a valid Finnish social security number.')) 

  • django/branches/unicode/django/contrib/localflavor/fr/forms.py

    r4918 r5229  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import gettext 
     8from django.utils.translation import ugettext 
    99import re 
    1010 
    …… 
    1515        super(FRZipCodeField, self).__init__(r'^\d{5}$', 
    1616            max_length=None, min_length=None, 
    17             error_message=gettext(u'Enter a zip code in the format XXXXX.'), 
     17            error_message=ugettext(u'Enter a zip code in the format XXXXX.'), 
    1818            *args, **kwargs) 
    1919 

  • django/branches/unicode/django/contrib/localflavor/is_/forms.py

    r5214 r5229  
    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 
    99 
    1010class ISIdNumberField(RegexField): 
    …… 
    1414    """ 
    1515    def __init__(self, *args, **kwargs): 
    16         error_msg = gettext(u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.') 
     16        error_msg = ugettext(u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.') 
    1717        kwargs['min_length'],kwargs['max_length'] = 10,11 
    1818        super(ISIdNumberField, self).__init__(r'^\d{6}(-| )?\d{4}$', error_message=error_msg, *args, **kwargs) 
    …… 
    2828            return self._format(value) 
    2929        else: 
    30             raise ValidationError(gettext(u'The Icelandic identification number is not valid.')) 
     30            raise ValidationError(ugettext(u'The Icelandic identification number is not valid.')) 
    3131 
    3232    def _canonify(self, value): 

  • django/branches/unicode/django/contrib/localflavor/it/forms.py

    r5054 r5229  
    55from django.newforms import ValidationError 
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    7 from django.utils.translation import gettext 
     7from django.utils.translation import ugettext 
    88from django.utils.encoding import smart_unicode 
    99from django.contrib.localflavor.it.util import ssn_check_digit, vat_number_check_digit 
    …… 
    1414        super(ITZipCodeField, self).__init__(r'^\d{5}$', 
    1515        max_length=None, min_length=None, 
    16         error_message=gettext(u'Enter a valid zip code.'), 
     16        error_message=ugettext(u'Enter a valid zip code.'), 
    1717        *args, **kwargs) 
    1818 
    …… 
    3939    'Informazioni sulla codificazione delle persone fisiche'. 
    4040    """ 
    41     err_msg = gettext(u'Enter a valid Social Security number.') 
     41    err_msg = ugettext(u'Enter a valid Social Security number.') 
    4242    def __init__(self, *args, **kwargs): 
    4343        super(ITSocialSecurityNumberField, self).__init__(r'^\w{3}\s*\w{3}\s*\w{5}\s*\w{5}$', 
    …… 
    6666        if value == u'': 
    6767            return value 
    68         err_msg = gettext(u'Enter a valid VAT number.') 
     68        err_msg = ugettext(u'Enter a valid VAT number.') 
    6969        try: 
    7070            vat_number = int(value) 

  • django/branches/unicode/django/contrib/localflavor/jp/forms.py

    r4822 r5229  
    55from django.core import validators 
    66from django.newforms import ValidationError 
    7 from django.utils.translation import gettext 
     7from django.utils.translation import ugettext 
    88from django.newforms.fields import RegexField, Select 
    99 
    …… 
    1919        super(JPPostalCodeField, self).__init__(r'^\d{3}-\d{4}$|^\d{7}$', 
    2020            max_length=None, min_length=None, 
    21             error_message=gettext(u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'), 
     21            error_message=ugettext(u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'), 
    2222            *args, **kwargs) 
    2323 

  • django/branches/unicode/django/contrib/localflavor/jp/jp_prefectures.py

    r4822 r5229  
    1 from django.utils.translation import gettext_lazy as gettext_lazy 
     1from django.utils.translation import ugettext_lazy 
    22 
    33JP_PREFECTURES = ( 
    4     ('hokkaido', gettext_lazy('Hokkaido'),), 
    5     ('aomori', gettext_lazy('Aomori'),), 
    6     ('iwate', gettext_lazy('Iwate'),), 
    7     ('miyagi', gettext_lazy('Miyagi'),), 
    8     ('akita', gettext_lazy('Akita'),), 
    9     ('yamagata', gettext_lazy('Yamagata'),), 
    10     ('fukushima', gettext_lazy('Fukushima'),), 
    11     ('ibaraki', gettext_lazy('Ibaraki'),), 
    12     ('tochigi', gettext_lazy('Tochigi'),), 
    13     ('gunma', gettext_lazy('Gunma'),), 
    14     ('saitama', gettext_lazy('Saitama'),), 
    15     ('chiba', gettext_lazy('Chiba'),), 
    16     ('tokyo', gettext_lazy('Tokyo'),), 
    17     ('kanagawa', gettext_lazy('Kanagawa'),), 
    18     ('yamanashi', gettext_lazy('Yamanashi'),), 
    19     ('nagano', gettext_lazy('Nagano'),), 
    20     ('niigata', gettext_lazy('Niigata'),), 
    21     ('toyama', gettext_lazy('Toyama'),), 
    22     ('ishikawa', gettext_lazy('Ishikawa'),), 
    23     ('fukui', gettext_lazy('Fukui'),), 
    24     ('gifu', gettext_lazy('Gifu'),), 
    25     ('shizuoka', gettext_lazy('Shizuoka'),), 
    26     ('aichi', gettext_lazy('Aichi'),), 
    27     ('mie', gettext_lazy('Mie'),), 
    28     ('shiga', gettext_lazy('Shiga'),), 
    29     ('kyoto', gettext_lazy('Kyoto'),), 
    30     ('osaka', gettext_lazy('Osaka'),), 
    31     ('hyogo', gettext_lazy('Hyogo'),), 
    32     ('nara', gettext_lazy('Nara'),), 
    33     ('wakayama', gettext_lazy('Wakayama'),), 
    34     ('tottori', gettext_lazy('Tottori'),), 
    35     ('shimane', gettext_lazy('Shimane'),), 
    36     ('okayama', gettext_lazy('Okayama'),), 
    37     ('hiroshima', gettext_lazy('Hiroshima'),), 
    38     ('yamaguchi', gettext_lazy('Yamaguchi'),), 
    39     ('tokushima', gettext_lazy('Tokushima'),), 
    40     ('kagawa', gettext_lazy('Kagawa'),), 
    41     ('ehime', gettext_lazy('Ehime'),), 
    42     ('kochi', gettext_lazy('Kochi'),), 
    43     ('fukuoka', gettext_lazy('Fukuoka'),), 
    44     ('saga', gettext_lazy('Saga'),), 
    45     ('nagasaki', gettext_lazy('Nagasaki'),), 
    46     ('kumamoto', gettext_lazy('Kumamoto'),), 
    47     ('oita', gettext_lazy('Oita'),), 
    48     ('miyazaki', gettext_lazy('Miyazaki'),), 
    49     ('kagoshima', gettext_lazy('Kagoshima'),), 
    50     ('okinawa', gettext_lazy('Okinawa'),), 
     4    ('hokkaido', ugettext_lazy('Hokkaido'),), 
     5    ('aomori', ugettext_lazy('Aomori'),), 
     6    ('iwate', ugettext_lazy('Iwate'),), 
     7    ('miyagi', ugettext_lazy('Miyagi'),), 
     8    ('akita', ugettext_lazy('Akita'),), 
     9    ('yamagata', ugettext_lazy('Yamagata'),), 
     10    ('fukushima', ugettext_lazy('Fukushima'),), 
     11    ('ibaraki', ugettext_lazy('Ibaraki'),), 
     12    ('tochigi', ugettext_lazy('Tochigi'),), 
     13    ('gunma', ugettext_lazy('Gunma'),), 
     14    ('saitama', ugettext_lazy('Saitama'),), 
     15    ('chiba', ugettext_lazy('Chiba'),), 
     16    ('tokyo', ugettext_lazy('Tokyo'),), 
     17    ('kanagawa', ugettext_lazy('Kanagawa'),), 
     18    ('yamanashi', ugettext_lazy('Yamanashi'),), 
     19    ('nagano', ugettext_lazy('Nagano'),), 
     20    ('niigata', ugettext_lazy('Niigata'),), 
     21    ('toyama', ugettext_lazy('Toyama'),), 
     22    ('ishikawa', ugettext_lazy('Ishikawa'),), 
     23    ('fukui', ugettext_lazy('Fukui'),), 
     24    ('gifu', ugettext_lazy('Gifu'),), 
     25    ('shizuoka', ugettext_lazy('Shizuoka'),), 
     26    ('aichi', ugettext_lazy('Aichi'),), 
     27    ('mie', ugettext_lazy('Mie'),), 
     28    ('shiga', ugettext_lazy('Shiga'),), 
     29    ('kyoto', ugettext_lazy('Kyoto'),), 
     30    ('osaka', ugettext_lazy('Osaka'),), 
     31    ('hyogo', ugettext_lazy('Hyogo'),), 
     32    ('nara', ugettext_lazy('Nara'),), 
     33    ('wakayama', ugettext_lazy('Wakayama'),), 
     34    ('tottori', ugettext_lazy('Tottori'),), 
     35    ('shimane', ugettext_lazy('Shimane'),), 
     36    ('okayama', ugettext_lazy('Okayama'),), 
     37    ('hiroshima', ugettext_lazy('Hiroshima'),), 
     38    ('yamaguchi', ugettext_lazy('Yamaguchi'),), 
     39    ('tokushima', ugettext_lazy('Tokushima'),), 
     40    ('kagawa', ugettext_lazy('Kagawa'),), 
     41    ('ehime', ugettext_lazy('Ehime'),), 
     42    ('kochi', ugettext_lazy('Kochi'),), 
     43    ('fukuoka', ugettext_lazy('Fukuoka'),), 
     44    ('saga', ugettext_lazy('Saga'),), 
     45    ('nagasaki', ugettext_lazy('Nagasaki'),), 
     46    ('kumamoto', ugettext_lazy('Kumamoto'),), 
     47    ('oita', ugettext_lazy('Oita'),), 
     48    ('miyazaki', ugettext_lazy('Miyazaki'),), 
     49    ('kagoshima', ugettext_lazy('Kagoshima'),), 
     50    ('okinawa', ugettext_lazy('Okinawa'),), 
    5151) 

  • django/branches/unicode/django/contrib/localflavor/no/forms.py

    r4888 r5229  
    77from django.newforms import ValidationError 
    88from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    9 from django.utils.translation import gettext 
     9from django.utils.translation import ugettext 
    1010 
    1111class NOZipCodeField(RegexField): 
    …… 
    1313        super(NOZipCodeField, self).__init__(r'^\d{4}$', 
    1414            max_length=None, min_length=None, 
    15             error_message=gettext(u'Enter a zip code in the format XXXX.'), 
     15            error_message=ugettext(u'Enter a zip code in the format XXXX.'), 
    1616            *args, **kwargs) 
    1717 
    …… 
    3434            return u'' 
    3535 
    36         msg = gettext(u'Enter a valid Norwegian social security number.') 
     36        msg = ugettext(u'Enter a valid Norwegian social security number.') 
    3737        if not re.match(r'^\d{11}$', value): 
    3838            raise ValidationError(msg) 

  • django/branches/unicode/django/contrib/localflavor/uk/forms.py

    r4527 r5229  
    44 
    55from django.newforms.fields import RegexField 
    6 from django.utils.translation import gettext 
     6from django.utils.translation import ugettext 
    77 
    88class UKPostcodeField(RegexField): 
    …… 
    1616        super(UKPostcodeField, self).__init__(r'^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HIK-Y][0-9](|[0-9]|[ABEHMNPRVWXY]))|[0-9][A-HJKSTUW]) [0-9][ABD-HJLNP-UW-Z]{2})$', 
    1717            max_length=None, min_length=None, 
    18             error_message=gettext(u'Enter a postcode. A space is required between the two postcode parts.'), 
     18            error_message=ugettext(u'Enter a postcode. A space is required between the two postcode parts.'), 
    1919            *args, **kwargs) 

  • django/branches/unicode/django/contrib/localflavor/us/forms.py

    r4973 r5229  
    66from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES 
    77from django.utils.encoding import smart_unicode 
    8 from django.utils.translation import gettext 
     8from django.utils.translation import ugettext 
    99import re 
    1010 
    …… 
    1616        super(USZipCodeField, self).__init__(r'^\d{5}(?:-\d{4})?$', 
    1717            max_length=None, min_length=None, 
    18             error_message=gettext(u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'), 
     18            error_message=ugettext(u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'), 
    1919            *args, **kwargs) 
    2020 
    …… 
    4949        if value in EMPTY_VALUES: 
    5050            return u'' 
    51         msg = gettext(u'Enter a valid U.S. Social Security number in XXX-XX-XXXX format.') 
     51        msg = ugettext(u'Enter a valid U.S. Social Security number in XXX-XX-XXXX format.') 
    5252        match = re.match(ssn_re, value) 
    5353        if not match: 

  • django/branches/unicode/django/contrib/redirects/models.py

    r5059 r5229  
    11from django.db import models 
    22from django.contrib.sites.models import Site 
    3 from django.utils.translation import gettext_lazy as _ 
     3from django.utils.translation import ugettext_lazy as _ 
    44 
    55class Redirect(models.Model): 

  • django/branches/unicode/django/contrib/sessions/models.py

    r4771 r5229  
    22import cPickle as pickle 
    33from django.db import models 
    4 from django.utils.translation import gettext_lazy as _ 
     4from django.utils.translation import ugettext_lazy as _ 
    55from django.conf import settings 
    66 

  • django/branches/unicode/django/contrib/sites/models.py

    r5059 r5229  
    11from django.db import models 
    2 from django.utils.translation import gettext_lazy as _ 
     2from django.utils.translation import ugettext_lazy as _ 
    33 
    44class SiteManager(models.Manager): 

  • django/branches/unicode/django/db/models/fields/related.py

    r5203 r5229  
    44from django.db.models.related import RelatedObject 
    55from django.utils.text import capfirst 
    6 from django.utils.translation import gettext_lazy, string_concat, ngettext 
     6from django.utils.translation import ugettext_lazy, string_concat, ungettext 
    77from django.utils.functional import curry 
    88from django.utils.encoding import smart_unicode 
    …… 
    641641 
    642642        if self.rel.raw_id_admin: 
    643             msg = gettext_lazy('Separate multiple IDs with commas.') 
    644         else: 
    645             msg = gettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.') 
     643            msg = ugettext_lazy('Separate multiple IDs with commas.') 
     644        else: 
     645            msg = ugettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.') 
    646646        self.help_text = string_concat(self.help_text, ' ', msg) 
    647647 
    …… 
    690690        if len(objects) != len(pks): 
    691691            badkeys = [k for k in pks if k not in objects] 
    692             raise validators.ValidationError, ngettext("Please enter valid %(self)s IDs. The value %(value)r is invalid.", 
     692            raise validators.ValidationError, ungettext("Please enter valid %(self)s IDs. The value %(value)r is invalid.", 
    693693                    "Please enter valid %(self)s IDs. The values %(value)r are invalid.", len(badkeys)) % { 
    694694                'self': self.verbose_name, 

  • django/branches/unicode/django/newforms/models.py

    r5214 r5229  
    44""" 
    55 
    6 from django.utils.translation import gettext 
     6from django.utils.translation import ugettext 
    77from util import ValidationError 
    88from forms import BaseForm, DeclarativeFieldsMetaclass, SortedDictFromList 
    …… 
    168168            value = self.queryset.model._default_manager.get(pk=value) 
    169169        except self.queryset.model.DoesNotExist: 
    170             raise ValidationError(gettext(u'Select a valid choice. That choice is not one of the available choices.')) 
     170            raise ValidationError(ugettext(u'Select a valid choice. That choice is not one of the available choices.')) 
    171171        return value 
    172172 
    …… 
    181181    def clean(self, value): 
    182182        if self.required and not value: 
    183             raise ValidationError(gettext(u'This field is required.')) 
     183            raise ValidationError(ugettext(u'This field is required.')) 
    184184        elif not self.required and not value: 
    185185            return [] 
    186186        if not isinstance(value, (list, tuple)): 
    187             raise ValidationError(gettext(u'Enter a list of values.')) 
     187            raise ValidationError(ugettext(u'Enter a list of values.')) 
    188188        final_values = [] 
    189189        for val in value: 
    …… 
    191191                obj = self.queryset.model._default_manager.get(pk=val) 
    192192            except self.queryset.model.DoesNotExist: 
    193                 raise ValidationError(gettext(u'Select a valid choice. %s is not one of the available choices.') % val) 
     193                raise ValidationError(ugettext(u'Select a valid choice. %s is not one of the available choices.') % val) 
    194194            else: 
    195195                final_values.append(obj) 

  • django/branches/unicode/django/newforms/widgets.py

    r5223 r5229  
    1313from django.utils.datastructures import MultiValueDict 
    1414from django.utils.html import escape 
    15 from django.utils.translation import gettext 
     15from django.utils.translation import ugettext 
    1616from django.utils.encoding import StrAndUnicode, smart_unicode 
    1717from itertools import chain 
    …… 
    178178    """ 
    179179    def __init__(self, attrs=None): 
    180         choices = ((u'1', gettext('Unknown')), (u'2', gettext('Yes')), (u'3', gettext('No'))) 
     180        choices = ((u'1', ugettext('Unknown')), (u'2', ugettext('Yes')), (u'3', ugettext('No'))) 
    181181        super(NullBooleanSelect, self).__init__(attrs, choices) 
    182182 

  • django/branches/unicode/django/templatetags/i18n.py

    r5082 r5229  
    1212    def render(self, context): 
    1313        from django.conf import settings 
    14         context[self.variable] = [(k, translation.gettext(v)) for k, v in settings.LANGUAGES] 
     14        context[self.variable] = [(k, translation.ugettext(v)) for k, v in settings.LANGUAGES] 
    1515        return '' 
    1616 

  • django/branches/unicode/django/views/generic/create_update.py

    r4265 r5229  
    77from django.http import Http404, HttpResponse, HttpResponseRedirect 
    88from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured 
    9 from django.utils.translation import gettext 
     9from django.utils.translation import ugettext 
    1010 
    1111def create_object(request, model, template_name=None, 
    …… 
    4141 
    4242            if request.user.is_authenticated(): 
    43                 request.user.message_set.create(message=gettext("The %(verbose_name)s was created successfully.") % {"verbose_name": model._meta.verbose_name}) 
     43                request.user.message_set.create(message=ugettext("The %(verbose_name)s was created successfully.") % {"verbose_name": model._meta.verbose_name}) 
    4444 
    4545            # Redirect to the new object: first by trying post_save_redirect, 
    …… 
    115115 
    116116            if request.user.is_authenticated(): 
    117                 request.user.message_set.create(message=gettext("The %(verbose_name)s was updated successfully.") % {"verbose_name": model._meta.verbose_name}) 
     117                request.user.message_set.create(message=ugettext("The %(verbose_name)s was updated successfully.") % {"verbose_name": model._meta.verbose_name}) 
    118118 
    119119            # Do a post-after-redirect so that reload works, etc. 
    …… 
    182182        object.delete() 
    183183        if request.user.is_authenticated(): 
    184             request.user.message_set.create(message=gettext("The %(verbose_name)s was delete