diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py index f113d884b7..421de52c0e 100644 --- a/django/contrib/admin/models.py +++ b/django/contrib/admin/models.py @@ -1,7 +1,7 @@ from django.db import models from django.contrib.contenttypes.models import ContentType from django.contrib.auth.models import User -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ ADDITION = 1 CHANGE = 2 diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py index 5389ca4dff..2a5b7335cd 100644 --- a/django/contrib/admin/views/decorators.py +++ b/django/contrib/admin/views/decorators.py @@ -3,11 +3,11 @@ from django.conf import settings from django.contrib.auth.models import User from django.contrib.auth import authenticate, login from django.shortcuts import render_to_response -from django.utils.translation import gettext_lazy +from django.utils.translation import ugettext_lazy import base64, datetime, md5 import cPickle as pickle -ERROR_MESSAGE = gettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.") +ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.") LOGIN_FORM_KEY = 'this_is_the_login_form' def _display_login_form(request, error_message=''): diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index 023f9b43be..5b9ab2a7ae 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -4,7 +4,7 @@ from django.contrib.sites.models import Site from django.template import Context, loader from django.core import validators from django import oldforms -from django.utils.translation import gettext as _ +from django.utils.translation import ugettext as _ class UserCreationForm(oldforms.Manipulator): "A form that creates a user, with no privileges, from the given username and password." diff --git a/django/contrib/comments/models.py b/django/contrib/comments/models.py index fa6c6aa363..e01937d5d8 100644 --- a/django/contrib/comments/models.py +++ b/django/contrib/comments/models.py @@ -2,7 +2,7 @@ from django.db import models from django.contrib.contenttypes.models import ContentType from django.contrib.sites.models import Site from django.contrib.auth.models import User -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ from django.conf import settings import datetime diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py index 73a9b2c480..d3c1d81e84 100644 --- a/django/contrib/comments/views/comments.py +++ b/django/contrib/comments/views/comments.py @@ -11,7 +11,7 @@ from django.contrib.auth.forms import AuthenticationForm from django.http import HttpResponseRedirect from django.utils.text import normalize_newlines from django.conf import settings -from django.utils.translation import ngettext +from django.utils.translation import ungettext, ugettext as _ import base64, datetime COMMENTS_PER_PAGE = 20 @@ -108,7 +108,7 @@ class PublicCommentManipulator(AuthenticationForm): # If the commentor has posted fewer than COMMENTS_FIRST_FEW comments, # send the comment to the managers. if self.user_cache.comment_set.count() <= settings.COMMENTS_FIRST_FEW: - message = ngettext('This comment was posted by a user who has posted fewer than %(count)s comment:\n\n%(text)s', + message = ungettext('This comment was posted by a user who has posted fewer than %(count)s comment:\n\n%(text)s', 'This comment was posted by a user who has posted fewer than %(count)s comments:\n\n%(text)s', settings.COMMENTS_FIRST_FEW) % \ {'count': settings.COMMENTS_FIRST_FEW, 'text': c.get_as_text()} mail_managers("Comment posted by rookie user", message) diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py index 100532e4de..314dff2cb2 100644 --- a/django/contrib/contenttypes/models.py +++ b/django/contrib/contenttypes/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ CONTENT_TYPE_CACHE = {} class ContentTypeManager(models.Manager): @@ -19,7 +19,7 @@ class ContentTypeManager(models.Manager): model=key[1], defaults={'name': str(opts.verbose_name)}) CONTENT_TYPE_CACHE[key] = ct return ct - + def clear_cache(self): """ Clear out the content-type cache. This needs to happen during database diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py index 86a239489d..c9e9090d7d 100644 --- a/django/contrib/flatpages/models.py +++ b/django/contrib/flatpages/models.py @@ -1,7 +1,7 @@ from django.core import validators from django.db import models from django.contrib.sites.models import Site -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ class FlatPage(models.Model): url = models.CharField(_('URL'), maxlength=100, validator_list=[validators.isAlphaNumericURL], db_index=True, diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py index a16cbcc9bb..425fd9c542 100644 --- a/django/contrib/humanize/templatetags/humanize.py +++ b/django/contrib/humanize/templatetags/humanize.py @@ -1,5 +1,4 @@ -from django.utils.translation import ngettext -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ungettext, ugettext_lazy as _ from django import template import re @@ -44,13 +43,13 @@ def intword(value): return value if value < 1000000000: new_value = value / 1000000.0 - return ngettext('%(value).1f million', '%(value).1f million', new_value) % {'value': new_value} + return ungettext('%(value).1f million', '%(value).1f million', new_value) % {'value': new_value} if value < 1000000000000: new_value = value / 1000000000.0 - return ngettext('%(value).1f billion', '%(value).1f billion', new_value) % {'value': new_value} + return ungettext('%(value).1f billion', '%(value).1f billion', new_value) % {'value': new_value} if value < 1000000000000000: new_value = value / 1000000000000.0 - return ngettext('%(value).1f trillion', '%(value).1f trillion', new_value) % {'value': new_value} + return ungettext('%(value).1f trillion', '%(value).1f trillion', new_value) % {'value': new_value} return value register.filter(intword) diff --git a/django/contrib/localflavor/au/forms.py b/django/contrib/localflavor/au/forms.py index b81a903d13..02250e24ed 100644 --- a/django/contrib/localflavor/au/forms.py +++ b/django/contrib/localflavor/au/forms.py @@ -5,7 +5,7 @@ Australian-specific Form helpers from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES from django.newforms.util import smart_unicode -from django.utils.translation import gettext +from django.utils.translation import ugettext import re PHONE_DIGITS_RE = re.compile(r'^(\d{10})$') @@ -15,7 +15,7 @@ class AUPostCodeField(RegexField): def __init__(self, *args, **kwargs): super(AUPostCodeField, self).__init__(r'^\d{4}$', max_length=None, min_length=None, - error_message=gettext(u'Enter a 4 digit post code.'), + error_message=ugettext(u'Enter a 4 digit post code.'), *args, **kwargs) class AUPhoneNumberField(Field): diff --git a/django/contrib/localflavor/br/forms.py b/django/contrib/localflavor/br/forms.py index 3487787643..bef6711734 100644 --- a/django/contrib/localflavor/br/forms.py +++ b/django/contrib/localflavor/br/forms.py @@ -6,7 +6,7 @@ BR-specific Form helpers from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES from django.utils.encoding import smart_unicode -from django.utils.translation import gettext +from django.utils.translation import ugettext import re phone_digits_re = re.compile(r'^(\d{2})[-\.]?(\d{4})[-\.]?(\d{4})$') @@ -15,7 +15,7 @@ class BRZipCodeField(RegexField): def __init__(self, *args, **kwargs): super(BRZipCodeField, self).__init__(r'^\d{5}-\d{3}$', max_length=None, min_length=None, - error_message=gettext('Enter a zip code in the format XXXXX-XXX.'), + error_message=ugettext('Enter a zip code in the format XXXXX-XXX.'), *args, **kwargs) class BRPhoneNumberField(Field): @@ -27,7 +27,7 @@ class BRPhoneNumberField(Field): m = phone_digits_re.search(value) if m: return u'%s-%s-%s' % (m.group(1), m.group(2), m.group(3)) - raise ValidationError(gettext(u'Phone numbers must be in XX-XXXX-XXXX format.')) + raise ValidationError(ugettext(u'Phone numbers must be in XX-XXXX-XXXX format.')) class BRStateSelect(Select): """ @@ -69,9 +69,9 @@ class BRCPFField(CharField): try: int(value) except ValueError: - raise ValidationError(gettext("This field requires only numbers.")) + raise ValidationError(ugettext("This field requires only numbers.")) if len(value) != 11: - raise ValidationError(gettext("This field requires at most 11 digits or 14 characters.")) + raise ValidationError(ugettext("This field requires at most 11 digits or 14 characters.")) orig_dv = value[-2:] new_1dv = sum([i * int(value[idx]) for idx, i in enumerate(range(10, 1, -1))]) @@ -81,7 +81,7 @@ class BRCPFField(CharField): new_2dv = DV_maker(new_2dv % 11) value = value[:-1] + str(new_2dv) if value[-2:] != orig_dv: - raise ValidationError(gettext("Invalid CPF number.")) + raise ValidationError(ugettext("Invalid CPF number.")) return orig_value @@ -103,7 +103,7 @@ class BRCNPJField(Field): raise ValidationError("This field requires only numbers.") if len(value) != 14: raise ValidationError( - gettext("This field requires at least 14 digits")) + ugettext("This field requires at least 14 digits")) orig_dv = value[-2:] new_1dv = sum([i * int(value[idx]) for idx, i in enumerate(range(5, 1, -1) + range(9, 1, -1))]) @@ -113,7 +113,7 @@ class BRCNPJField(Field): new_2dv = DV_maker(new_2dv % 11) value = value[:-1] + str(new_2dv) if value[-2:] != orig_dv: - raise ValidationError(gettext("Invalid CNPJ number.")) + raise ValidationError(ugettext("Invalid CNPJ number.")) return orig_value diff --git a/django/contrib/localflavor/ch/ch_states.py b/django/contrib/localflavor/ch/ch_states.py index e9bbcc6268..ba5934a4d4 100644 --- a/django/contrib/localflavor/ch/ch_states.py +++ b/django/contrib/localflavor/ch/ch_states.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -* -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ STATE_CHOICES = ( ('AG', _('Aargau')), diff --git a/django/contrib/localflavor/ch/forms.py b/django/contrib/localflavor/ch/forms.py index 51e52dc0e9..5e601f5d74 100644 --- a/django/contrib/localflavor/ch/forms.py +++ b/django/contrib/localflavor/ch/forms.py @@ -5,7 +5,7 @@ Swiss-specific Form helpers from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES from django.utils.encoding import smart_unicode -from django.utils.translation import gettext +from django.utils.translation import ugettext import re id_re = re.compile(r"^(?P\w{8})(?P(\d{1}|<))(?P\d{1})$") @@ -15,7 +15,7 @@ class CHZipCodeField(RegexField): def __init__(self, *args, **kwargs): super(CHZipCodeField, self).__init__(r'^\d{4}$', max_length=None, min_length=None, - error_message=gettext('Enter a zip code in the format XXXX.'), + error_message=ugettext('Enter a zip code in the format XXXX.'), *args, **kwargs) class CHPhoneNumberField(Field): @@ -87,7 +87,7 @@ class CHIdentityCardNumberField(Field): def clean(self, value): super(CHIdentityCardNumberField, self).clean(value) - error_msg = gettext('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.') + error_msg = ugettext('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.') if value in EMPTY_VALUES: return u'' diff --git a/django/contrib/localflavor/cl/forms.py b/django/contrib/localflavor/cl/forms.py index 87c8093407..96eb91cf42 100644 --- a/django/contrib/localflavor/cl/forms.py +++ b/django/contrib/localflavor/cl/forms.py @@ -4,7 +4,7 @@ Chile specific form helpers. from django.newforms import ValidationError from django.newforms.fields import RegexField, EMPTY_VALUES -from django.utils.translation import gettext +from django.utils.translation import ugettext class CLRutField(RegexField): """ @@ -18,12 +18,12 @@ class CLRutField(RegexField): if 'strict' in kwargs: del kwargs['strict'] super(CLRutField, self).__init__(r'^(\d{1,2}\.)?\d{3}\.\d{3}-[\dkK]$', - error_message=gettext('Enter valid a Chilean RUT. The format is XX.XXX.XXX-X.'), + error_message=ugettext('Enter valid a Chilean RUT. The format is XX.XXX.XXX-X.'), *args, **kwargs) else: # In non-strict mode, accept RUTs that validate but do not exist in # the real world. - super(CLRutField, self).__init__(r'^[\d\.]{1,11}-?[\dkK]$', error_message=gettext(u'Enter valid a Chilean RUT'), *args, **kwargs) + super(CLRutField, self).__init__(r'^[\d\.]{1,11}-?[\dkK]$', error_message=ugettext(u'Enter valid a Chilean RUT'), *args, **kwargs) def clean(self, value): """ diff --git a/django/contrib/localflavor/de/de_states.py b/django/contrib/localflavor/de/de_states.py index c00fd2e293..2872a7871a 100644 --- a/django/contrib/localflavor/de/de_states.py +++ b/django/contrib/localflavor/de/de_states.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -* -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ STATE_CHOICES = ( ('BW', _('Baden-Wuerttemberg')), diff --git a/django/contrib/localflavor/de/forms.py b/django/contrib/localflavor/de/forms.py index 8e140c125f..34e4f176db 100644 --- a/django/contrib/localflavor/de/forms.py +++ b/django/contrib/localflavor/de/forms.py @@ -4,7 +4,7 @@ DE-specific Form helpers from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES -from django.utils.translation import gettext +from django.utils.translation import ugettext import re id_re = re.compile(r"^(?P\d{10})(?P\w{1,3})[-\ ]?(?P\d{7})[-\ ]?(?P\d{7})[-\ ]?(?P\d{1})$") @@ -13,7 +13,7 @@ class DEZipCodeField(RegexField): def __init__(self, *args, **kwargs): super(DEZipCodeField, self).__init__(r'^\d{5}$', max_length=None, min_length=None, - error_message=gettext(u'Enter a zip code in the format XXXXX.'), + error_message=ugettext(u'Enter a zip code in the format XXXXX.'), *args, **kwargs) class DEStateSelect(Select): @@ -57,7 +57,7 @@ class DEIdentityCardNumberField(Field): def clean(self, value): super(DEIdentityCardNumberField, self).clean(value) - error_msg = gettext(u'Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.') + error_msg = ugettext(u'Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.') if value in EMPTY_VALUES: return u'' match = re.match(id_re, value) diff --git a/django/contrib/localflavor/fi/forms.py b/django/contrib/localflavor/fi/forms.py index da5cb5f2a8..27e658362a 100644 --- a/django/contrib/localflavor/fi/forms.py +++ b/django/contrib/localflavor/fi/forms.py @@ -5,13 +5,13 @@ FI-specific Form helpers import re from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES -from django.utils.translation import gettext +from django.utils.translation import ugettext class FIZipCodeField(RegexField): def __init__(self, *args, **kwargs): super(FIZipCodeField, self).__init__(r'^\d{5}$', max_length=None, min_length=None, - error_message=gettext(u'Enter a zip code in the format XXXXX.'), + error_message=ugettext(u'Enter a zip code in the format XXXXX.'), *args, **kwargs) class FIMunicipalitySelect(Select): @@ -37,9 +37,9 @@ class FISocialSecurityNumber(Field): (?P(\d{3})) (?P[%s])$""" % checkmarks, value, re.VERBOSE | re.IGNORECASE) if not result: - raise ValidationError(gettext(u'Enter a valid Finnish social security number.')) + raise ValidationError(ugettext(u'Enter a valid Finnish social security number.')) gd = result.groupdict() checksum = int(gd['date'] + gd['serial']) if checkmarks[checksum % len(checkmarks)] == gd['checksum'].upper(): return u'%s' % value.upper() - raise ValidationError(gettext(u'Enter a valid Finnish social security number.')) + raise ValidationError(ugettext(u'Enter a valid Finnish social security number.')) diff --git a/django/contrib/localflavor/fr/forms.py b/django/contrib/localflavor/fr/forms.py index 550596b880..5b7be616a3 100644 --- a/django/contrib/localflavor/fr/forms.py +++ b/django/contrib/localflavor/fr/forms.py @@ -5,7 +5,7 @@ FR-specific Form helpers from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES from django.utils.encoding import smart_unicode -from django.utils.translation import gettext +from django.utils.translation import ugettext import re phone_digits_re = re.compile(r'^0\d(\s|\.)?(\d{2}(\s|\.)?){3}\d{2}$') @@ -14,7 +14,7 @@ class FRZipCodeField(RegexField): def __init__(self, *args, **kwargs): super(FRZipCodeField, self).__init__(r'^\d{5}$', max_length=None, min_length=None, - error_message=gettext(u'Enter a zip code in the format XXXXX.'), + error_message=ugettext(u'Enter a zip code in the format XXXXX.'), *args, **kwargs) class FRPhoneNumberField(Field): diff --git a/django/contrib/localflavor/is_/forms.py b/django/contrib/localflavor/is_/forms.py index 41727d8fa3..b4c477f057 100644 --- a/django/contrib/localflavor/is_/forms.py +++ b/django/contrib/localflavor/is_/forms.py @@ -5,7 +5,7 @@ Iceland specific form helpers. from django.newforms import ValidationError from django.newforms.fields import RegexField, EMPTY_VALUES from django.newforms.widgets import Select -from django.utils.translation import gettext +from django.utils.translation import ugettext class ISIdNumberField(RegexField): """ @@ -13,7 +13,7 @@ class ISIdNumberField(RegexField): of Iceland has. """ def __init__(self, *args, **kwargs): - error_msg = gettext(u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.') + error_msg = ugettext(u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.') kwargs['min_length'],kwargs['max_length'] = 10,11 super(ISIdNumberField, self).__init__(r'^\d{6}(-| )?\d{4}$', error_message=error_msg, *args, **kwargs) @@ -27,7 +27,7 @@ class ISIdNumberField(RegexField): if self._validate(value): return self._format(value) else: - raise ValidationError(gettext(u'The Icelandic identification number is not valid.')) + raise ValidationError(ugettext(u'The Icelandic identification number is not valid.')) def _canonify(self, value): """ diff --git a/django/contrib/localflavor/it/forms.py b/django/contrib/localflavor/it/forms.py index bb1bb2e6a4..ae98b6f414 100644 --- a/django/contrib/localflavor/it/forms.py +++ b/django/contrib/localflavor/it/forms.py @@ -4,7 +4,7 @@ IT-specific Form helpers from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES -from django.utils.translation import gettext +from django.utils.translation import ugettext from django.utils.encoding import smart_unicode from django.contrib.localflavor.it.util import ssn_check_digit, vat_number_check_digit import re @@ -13,7 +13,7 @@ class ITZipCodeField(RegexField): def __init__(self, *args, **kwargs): super(ITZipCodeField, self).__init__(r'^\d{5}$', max_length=None, min_length=None, - error_message=gettext(u'Enter a valid zip code.'), + error_message=ugettext(u'Enter a valid zip code.'), *args, **kwargs) class ITRegionSelect(Select): @@ -38,7 +38,7 @@ class ITSocialSecurityNumberField(RegexField): For reference see http://www.agenziaentrate.it/ and search for 'Informazioni sulla codificazione delle persone fisiche'. """ - err_msg = gettext(u'Enter a valid Social Security number.') + err_msg = ugettext(u'Enter a valid Social Security number.') def __init__(self, *args, **kwargs): super(ITSocialSecurityNumberField, self).__init__(r'^\w{3}\s*\w{3}\s*\w{5}\s*\w{5}$', max_length=None, min_length=None, error_message=self.err_msg, @@ -65,7 +65,7 @@ class ITVatNumberField(Field): value = super(ITVatNumberField, self).clean(value) if value == u'': return value - err_msg = gettext(u'Enter a valid VAT number.') + err_msg = ugettext(u'Enter a valid VAT number.') try: vat_number = int(value) except ValueError: diff --git a/django/contrib/localflavor/jp/forms.py b/django/contrib/localflavor/jp/forms.py index 4d93a21227..9f6244e1c9 100644 --- a/django/contrib/localflavor/jp/forms.py +++ b/django/contrib/localflavor/jp/forms.py @@ -4,7 +4,7 @@ JP-specific Form helpers from django.core import validators from django.newforms import ValidationError -from django.utils.translation import gettext +from django.utils.translation import ugettext from django.newforms.fields import RegexField, Select import re @@ -18,7 +18,7 @@ class JPPostalCodeField(RegexField): def __init__(self, *args, **kwargs): super(JPPostalCodeField, self).__init__(r'^\d{3}-\d{4}$|^\d{7}$', max_length=None, min_length=None, - error_message=gettext(u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'), + error_message=ugettext(u'Enter a postal code in the format XXXXXXX or XXX-XXXX.'), *args, **kwargs) def clean(self, value): diff --git a/django/contrib/localflavor/jp/jp_prefectures.py b/django/contrib/localflavor/jp/jp_prefectures.py index 72ac4f9474..f079fe6a3d 100644 --- a/django/contrib/localflavor/jp/jp_prefectures.py +++ b/django/contrib/localflavor/jp/jp_prefectures.py @@ -1,51 +1,51 @@ -from django.utils.translation import gettext_lazy as gettext_lazy +from django.utils.translation import ugettext_lazy JP_PREFECTURES = ( - ('hokkaido', gettext_lazy('Hokkaido'),), - ('aomori', gettext_lazy('Aomori'),), - ('iwate', gettext_lazy('Iwate'),), - ('miyagi', gettext_lazy('Miyagi'),), - ('akita', gettext_lazy('Akita'),), - ('yamagata', gettext_lazy('Yamagata'),), - ('fukushima', gettext_lazy('Fukushima'),), - ('ibaraki', gettext_lazy('Ibaraki'),), - ('tochigi', gettext_lazy('Tochigi'),), - ('gunma', gettext_lazy('Gunma'),), - ('saitama', gettext_lazy('Saitama'),), - ('chiba', gettext_lazy('Chiba'),), - ('tokyo', gettext_lazy('Tokyo'),), - ('kanagawa', gettext_lazy('Kanagawa'),), - ('yamanashi', gettext_lazy('Yamanashi'),), - ('nagano', gettext_lazy('Nagano'),), - ('niigata', gettext_lazy('Niigata'),), - ('toyama', gettext_lazy('Toyama'),), - ('ishikawa', gettext_lazy('Ishikawa'),), - ('fukui', gettext_lazy('Fukui'),), - ('gifu', gettext_lazy('Gifu'),), - ('shizuoka', gettext_lazy('Shizuoka'),), - ('aichi', gettext_lazy('Aichi'),), - ('mie', gettext_lazy('Mie'),), - ('shiga', gettext_lazy('Shiga'),), - ('kyoto', gettext_lazy('Kyoto'),), - ('osaka', gettext_lazy('Osaka'),), - ('hyogo', gettext_lazy('Hyogo'),), - ('nara', gettext_lazy('Nara'),), - ('wakayama', gettext_lazy('Wakayama'),), - ('tottori', gettext_lazy('Tottori'),), - ('shimane', gettext_lazy('Shimane'),), - ('okayama', gettext_lazy('Okayama'),), - ('hiroshima', gettext_lazy('Hiroshima'),), - ('yamaguchi', gettext_lazy('Yamaguchi'),), - ('tokushima', gettext_lazy('Tokushima'),), - ('kagawa', gettext_lazy('Kagawa'),), - ('ehime', gettext_lazy('Ehime'),), - ('kochi', gettext_lazy('Kochi'),), - ('fukuoka', gettext_lazy('Fukuoka'),), - ('saga', gettext_lazy('Saga'),), - ('nagasaki', gettext_lazy('Nagasaki'),), - ('kumamoto', gettext_lazy('Kumamoto'),), - ('oita', gettext_lazy('Oita'),), - ('miyazaki', gettext_lazy('Miyazaki'),), - ('kagoshima', gettext_lazy('Kagoshima'),), - ('okinawa', gettext_lazy('Okinawa'),), + ('hokkaido', ugettext_lazy('Hokkaido'),), + ('aomori', ugettext_lazy('Aomori'),), + ('iwate', ugettext_lazy('Iwate'),), + ('miyagi', ugettext_lazy('Miyagi'),), + ('akita', ugettext_lazy('Akita'),), + ('yamagata', ugettext_lazy('Yamagata'),), + ('fukushima', ugettext_lazy('Fukushima'),), + ('ibaraki', ugettext_lazy('Ibaraki'),), + ('tochigi', ugettext_lazy('Tochigi'),), + ('gunma', ugettext_lazy('Gunma'),), + ('saitama', ugettext_lazy('Saitama'),), + ('chiba', ugettext_lazy('Chiba'),), + ('tokyo', ugettext_lazy('Tokyo'),), + ('kanagawa', ugettext_lazy('Kanagawa'),), + ('yamanashi', ugettext_lazy('Yamanashi'),), + ('nagano', ugettext_lazy('Nagano'),), + ('niigata', ugettext_lazy('Niigata'),), + ('toyama', ugettext_lazy('Toyama'),), + ('ishikawa', ugettext_lazy('Ishikawa'),), + ('fukui', ugettext_lazy('Fukui'),), + ('gifu', ugettext_lazy('Gifu'),), + ('shizuoka', ugettext_lazy('Shizuoka'),), + ('aichi', ugettext_lazy('Aichi'),), + ('mie', ugettext_lazy('Mie'),), + ('shiga', ugettext_lazy('Shiga'),), + ('kyoto', ugettext_lazy('Kyoto'),), + ('osaka', ugettext_lazy('Osaka'),), + ('hyogo', ugettext_lazy('Hyogo'),), + ('nara', ugettext_lazy('Nara'),), + ('wakayama', ugettext_lazy('Wakayama'),), + ('tottori', ugettext_lazy('Tottori'),), + ('shimane', ugettext_lazy('Shimane'),), + ('okayama', ugettext_lazy('Okayama'),), + ('hiroshima', ugettext_lazy('Hiroshima'),), + ('yamaguchi', ugettext_lazy('Yamaguchi'),), + ('tokushima', ugettext_lazy('Tokushima'),), + ('kagawa', ugettext_lazy('Kagawa'),), + ('ehime', ugettext_lazy('Ehime'),), + ('kochi', ugettext_lazy('Kochi'),), + ('fukuoka', ugettext_lazy('Fukuoka'),), + ('saga', ugettext_lazy('Saga'),), + ('nagasaki', ugettext_lazy('Nagasaki'),), + ('kumamoto', ugettext_lazy('Kumamoto'),), + ('oita', ugettext_lazy('Oita'),), + ('miyazaki', ugettext_lazy('Miyazaki'),), + ('kagoshima', ugettext_lazy('Kagoshima'),), + ('okinawa', ugettext_lazy('Okinawa'),), ) diff --git a/django/contrib/localflavor/no/forms.py b/django/contrib/localflavor/no/forms.py index 22099005b9..8d1867097c 100644 --- a/django/contrib/localflavor/no/forms.py +++ b/django/contrib/localflavor/no/forms.py @@ -6,13 +6,13 @@ Norwegian-specific Form helpers import re, datetime from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES -from django.utils.translation import gettext +from django.utils.translation import ugettext class NOZipCodeField(RegexField): def __init__(self, *args, **kwargs): super(NOZipCodeField, self).__init__(r'^\d{4}$', max_length=None, min_length=None, - error_message=gettext(u'Enter a zip code in the format XXXX.'), + error_message=ugettext(u'Enter a zip code in the format XXXX.'), *args, **kwargs) class NOMunicipalitySelect(Select): @@ -33,7 +33,7 @@ class NOSocialSecurityNumber(Field): if value in EMPTY_VALUES: return u'' - msg = gettext(u'Enter a valid Norwegian social security number.') + msg = ugettext(u'Enter a valid Norwegian social security number.') if not re.match(r'^\d{11}$', value): raise ValidationError(msg) diff --git a/django/contrib/localflavor/uk/forms.py b/django/contrib/localflavor/uk/forms.py index ddd033e1e0..84d6c0e157 100644 --- a/django/contrib/localflavor/uk/forms.py +++ b/django/contrib/localflavor/uk/forms.py @@ -3,7 +3,7 @@ UK-specific Form helpers """ from django.newforms.fields import RegexField -from django.utils.translation import gettext +from django.utils.translation import ugettext class UKPostcodeField(RegexField): """ @@ -15,5 +15,5 @@ class UKPostcodeField(RegexField): def __init__(self, *args, **kwargs): 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})$', max_length=None, min_length=None, - error_message=gettext(u'Enter a postcode. A space is required between the two postcode parts.'), + error_message=ugettext(u'Enter a postcode. A space is required between the two postcode parts.'), *args, **kwargs) diff --git a/django/contrib/localflavor/us/forms.py b/django/contrib/localflavor/us/forms.py index feda68291b..70f7b0cef1 100644 --- a/django/contrib/localflavor/us/forms.py +++ b/django/contrib/localflavor/us/forms.py @@ -5,7 +5,7 @@ USA-specific Form helpers from django.newforms import ValidationError from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES from django.utils.encoding import smart_unicode -from django.utils.translation import gettext +from django.utils.translation import ugettext import re phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$') @@ -15,7 +15,7 @@ class USZipCodeField(RegexField): def __init__(self, *args, **kwargs): super(USZipCodeField, self).__init__(r'^\d{5}(?:-\d{4})?$', max_length=None, min_length=None, - error_message=gettext(u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'), + error_message=ugettext(u'Enter a zip code in the format XXXXX or XXXXX-XXXX.'), *args, **kwargs) class USPhoneNumberField(Field): @@ -48,7 +48,7 @@ class USSocialSecurityNumberField(Field): super(USSocialSecurityNumberField, self).clean(value) if value in EMPTY_VALUES: return u'' - msg = gettext(u'Enter a valid U.S. Social Security number in XXX-XX-XXXX format.') + msg = ugettext(u'Enter a valid U.S. Social Security number in XXX-XX-XXXX format.') match = re.match(ssn_re, value) if not match: raise ValidationError(msg) diff --git a/django/contrib/redirects/models.py b/django/contrib/redirects/models.py index 791b9c9091..6a3f5c9ff5 100644 --- a/django/contrib/redirects/models.py +++ b/django/contrib/redirects/models.py @@ -1,6 +1,6 @@ from django.db import models from django.contrib.sites.models import Site -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ class Redirect(models.Model): site = models.ForeignKey(Site, radio_admin=models.VERTICAL) diff --git a/django/contrib/sessions/models.py b/django/contrib/sessions/models.py index 77718407e1..5b18ed246a 100644 --- a/django/contrib/sessions/models.py +++ b/django/contrib/sessions/models.py @@ -1,7 +1,7 @@ import base64, md5, random, sys, datetime import cPickle as pickle from django.db import models -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ from django.conf import settings class SessionManager(models.Manager): diff --git a/django/contrib/sites/models.py b/django/contrib/sites/models.py index 5bce56eba4..276c58474c 100644 --- a/django/contrib/sites/models.py +++ b/django/contrib/sites/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ class SiteManager(models.Manager): def get_current(self): diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index deb4535f18..93b0608fc6 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -3,7 +3,7 @@ from django.db.models import signals, get_model from django.db.models.fields import AutoField, Field, IntegerField, get_ul_class from django.db.models.related import RelatedObject from django.utils.text import capfirst -from django.utils.translation import gettext_lazy, string_concat, ngettext +from django.utils.translation import ugettext_lazy, string_concat, ungettext from django.utils.functional import curry from django.utils.encoding import smart_unicode from django.core import validators @@ -640,9 +640,9 @@ class ManyToManyField(RelatedField, Field): Field.__init__(self, **kwargs) if self.rel.raw_id_admin: - msg = gettext_lazy('Separate multiple IDs with commas.') + msg = ugettext_lazy('Separate multiple IDs with commas.') else: - msg = gettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.') + msg = ugettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.') self.help_text = string_concat(self.help_text, ' ', msg) def get_manipulator_field_objs(self): @@ -689,7 +689,7 @@ class ManyToManyField(RelatedField, Field): objects = mod._default_manager.in_bulk(pks) if len(objects) != len(pks): badkeys = [k for k in pks if k not in objects] - raise validators.ValidationError, ngettext("Please enter valid %(self)s IDs. The value %(value)r is invalid.", + raise validators.ValidationError, ungettext("Please enter valid %(self)s IDs. The value %(value)r is invalid.", "Please enter valid %(self)s IDs. The values %(value)r are invalid.", len(badkeys)) % { 'self': self.verbose_name, 'value': len(badkeys) == 1 and badkeys[0] or tuple(badkeys), diff --git a/django/newforms/models.py b/django/newforms/models.py index ea99ca9ea0..cee6ab1c74 100644 --- a/django/newforms/models.py +++ b/django/newforms/models.py @@ -3,7 +3,7 @@ Helper functions for creating Form classes from Django models and database field objects. """ -from django.utils.translation import gettext +from django.utils.translation import ugettext from util import ValidationError from forms import BaseForm, DeclarativeFieldsMetaclass, SortedDictFromList from fields import Field, ChoiceField @@ -167,7 +167,7 @@ class ModelChoiceField(ChoiceField): try: value = self.queryset.model._default_manager.get(pk=value) except self.queryset.model.DoesNotExist: - raise ValidationError(gettext(u'Select a valid choice. That choice is not one of the available choices.')) + raise ValidationError(ugettext(u'Select a valid choice. That choice is not one of the available choices.')) return value class ModelMultipleChoiceField(ModelChoiceField): @@ -180,17 +180,17 @@ class ModelMultipleChoiceField(ModelChoiceField): def clean(self, value): if self.required and not value: - raise ValidationError(gettext(u'This field is required.')) + raise ValidationError(ugettext(u'This field is required.')) elif not self.required and not value: return [] if not isinstance(value, (list, tuple)): - raise ValidationError(gettext(u'Enter a list of values.')) + raise ValidationError(ugettext(u'Enter a list of values.')) final_values = [] for val in value: try: obj = self.queryset.model._default_manager.get(pk=val) except self.queryset.model.DoesNotExist: - raise ValidationError(gettext(u'Select a valid choice. %s is not one of the available choices.') % val) + raise ValidationError(ugettext(u'Select a valid choice. %s is not one of the available choices.') % val) else: final_values.append(obj) return final_values diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py index a726ebf894..758f703612 100644 --- a/django/newforms/widgets.py +++ b/django/newforms/widgets.py @@ -12,7 +12,7 @@ __all__ = ( from util import flatatt from django.utils.datastructures import MultiValueDict from django.utils.html import escape -from django.utils.translation import gettext +from django.utils.translation import ugettext from django.utils.encoding import StrAndUnicode, smart_unicode from itertools import chain @@ -177,7 +177,7 @@ class NullBooleanSelect(Select): A Select Widget intended to be used with NullBooleanField. """ def __init__(self, attrs=None): - choices = ((u'1', gettext('Unknown')), (u'2', gettext('Yes')), (u'3', gettext('No'))) + choices = ((u'1', ugettext('Unknown')), (u'2', ugettext('Yes')), (u'3', ugettext('No'))) super(NullBooleanSelect, self).__init__(attrs, choices) def render(self, name, value, attrs=None, choices=()): diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py index 6a97e83bb7..1e85c6b5d1 100644 --- a/django/templatetags/i18n.py +++ b/django/templatetags/i18n.py @@ -11,7 +11,7 @@ class GetAvailableLanguagesNode(Node): def render(self, context): from django.conf import settings - context[self.variable] = [(k, translation.gettext(v)) for k, v in settings.LANGUAGES] + context[self.variable] = [(k, translation.ugettext(v)) for k, v in settings.LANGUAGES] return '' class GetCurrentLanguageNode(Node): diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py index 28987f7544..a4559ad495 100644 --- a/django/views/generic/create_update.py +++ b/django/views/generic/create_update.py @@ -6,7 +6,7 @@ from django.contrib.auth.views import redirect_to_login from django.template import RequestContext from django.http import Http404, HttpResponse, HttpResponseRedirect from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured -from django.utils.translation import gettext +from django.utils.translation import ugettext def create_object(request, model, template_name=None, template_loader=loader, extra_context=None, post_save_redirect=None, @@ -40,7 +40,7 @@ def create_object(request, model, template_name=None, new_object = manipulator.save(new_data) if request.user.is_authenticated(): - request.user.message_set.create(message=gettext("The %(verbose_name)s was created successfully.") % {"verbose_name": model._meta.verbose_name}) + request.user.message_set.create(message=ugettext("The %(verbose_name)s was created successfully.") % {"verbose_name": model._meta.verbose_name}) # Redirect to the new object: first by trying post_save_redirect, # then by obj.get_absolute_url; fail if neither works. @@ -114,7 +114,7 @@ def update_object(request, model, object_id=None, slug=None, object = manipulator.save(new_data) if request.user.is_authenticated(): - request.user.message_set.create(message=gettext("The %(verbose_name)s was updated successfully.") % {"verbose_name": model._meta.verbose_name}) + request.user.message_set.create(message=ugettext("The %(verbose_name)s was updated successfully.") % {"verbose_name": model._meta.verbose_name}) # Do a post-after-redirect so that reload works, etc. if post_save_redirect: @@ -181,7 +181,7 @@ def delete_object(request, model, post_delete_redirect, if request.method == 'POST': object.delete() if request.user.is_authenticated(): - request.user.message_set.create(message=gettext("The %(verbose_name)s was deleted.") % {"verbose_name": model._meta.verbose_name}) + request.user.message_set.create(message=ugettext("The %(verbose_name)s was deleted.") % {"verbose_name": model._meta.verbose_name}) return HttpResponseRedirect(post_delete_redirect) else: if not template_name: diff --git a/tests/regressiontests/forms/regressions.py b/tests/regressiontests/forms/regressions.py index 0e0b0a7f3d..c5a94db6f9 100644 --- a/tests/regressiontests/forms/regressions.py +++ b/tests/regressiontests/forms/regressions.py @@ -16,9 +16,9 @@ u'

F1:

\n

####################### There were some problems with form translations in #3600 ->>> from django.utils.translation import gettext_lazy, activate, deactivate +>>> from django.utils.translation import ugettext_lazy, activate, deactivate >>> class SomeForm(Form): -... username = CharField(max_length=10, label=gettext_lazy('Username')) +... username = CharField(max_length=10, label=ugettext_lazy('Username')) >>> f = SomeForm() >>> print f.as_p()