Django

Code

Changeset 5230

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

unicode: Replaced all implicit uses of _() from builtins with explicitly
importing ugettext and aliasing it to _. Refs #2920.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r5200 r5230  
    99from django.db import models 
    1010from django.utils.encoding import smart_unicode 
     11from django.utils.translation import ugettext as _ 
    1112import datetime 
    1213 

  • django/branches/unicode/django/contrib/admin/templatetags/admin_list.py

    r5200 r5230  
    77from django.utils.html import escape 
    88from django.utils.text import capfirst 
    9 from django.utils.translation import get_date_formats, get_partial_date_formats 
     9from django.utils.translation import get_date_formats, get_partial_date_formats, ugettext as _ 
    1010from django.utils.encoding import smart_unicode, smart_str 
    1111from django.template import Library 

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

    r5126 r5230  
    77from django.http import HttpResponseRedirect 
    88from django.utils.html import escape 
     9from django.utils.translation import ugettext as _ 
    910 
    1011def user_add_stage(request): 

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

    r5229 r5230  
    44from django.contrib.auth import authenticate, login 
    55from django.shortcuts import render_to_response 
    6 from django.utils.translation import ugettext_lazy 
     6from django.utils.translation import ugettext_lazy, ugettext as _ 
    77import base64, datetime, md5 
    88import cPickle as pickle 

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

    r4704 r5230  
    1010from django.contrib.admin import utils 
    1111from django.contrib.sites.models import Site 
     12from django.utils.translation import ugettext as _ 
    1213import inspect, os, re 
    1314 

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

    r5200 r5230  
    1414from django.utils.text import capfirst, get_text_list 
    1515from django.utils.encoding import smart_unicode 
     16from django.utils.translation import ugettext as _ 
    1617import operator 
    1718 

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

    r5081 r5230  
    33from django.db import backend, connection, models 
    44from django.contrib.contenttypes.models import ContentType 
    5 from django.utils.translation import ugettext_lazy 
     5from django.utils.translation import ugettext_lazy, ugettext as _ 
    66import datetime 
    77 

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

    r5081 r5230  
    88from django.contrib.auth.decorators import login_required 
    99from django.contrib.auth import REDIRECT_FIELD_NAME 
     10from django.utils.translation import ugettext as _ 
    1011 
    1112def login(request, template_name='registration/login.html'): 

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

    r4486 r5230  
    33from django.template import RequestContext 
    44from django.contrib.comments.models import Comment, KarmaScore 
     5from django.utils.translation import ugettext as _ 
    56 
    67def vote(request, comment_id, vote): 

  • django/branches/unicode/django/core/validators.py

    r5126 r5230  
    1111import urllib2 
    1212from django.conf import settings 
    13 from django.utils.translation import ugettext, ugettext_lazy, ungettext 
     13from django.utils.translation import ugettext as _, ugettext_lazy, ungettext 
    1414from django.utils.functional import Promise, lazy 
    1515import re 
    …… 
    6262def isAlphaNumeric(field_data, all_data): 
    6363    if not alnum_re.search(field_data): 
    64         raise ValidationError, ugettext("This value must contain only letters, numbers and underscores.") 
     64        raise ValidationError, _("This value must contain only letters, numbers and underscores.") 
    6565 
    6666def isAlphaNumericURL(field_data, all_data): 
    6767    if not alnumurl_re.search(field_data): 
    68         raise ValidationError, ugettext("This value must contain only letters, numbers, underscores, dashes or slashes.") 
     68        raise ValidationError, _("This value must contain only letters, numbers, underscores, dashes or slashes.") 
    6969 
    7070def isSlug(field_data, all_data): 
    7171    if not slug_re.search(field_data): 
    72         raise ValidationError, ugettext("This value must contain only letters, numbers, underscores or hyphens.") 
     72        raise ValidationError, _("This value must contain only letters, numbers, underscores or hyphens.") 
    7373 
    7474def isLowerCase(field_data, all_data): 
    7575    if field_data.lower() != field_data: 
    76         raise ValidationError, ugettext("Uppercase letters are not allowed here.") 
     76        raise ValidationError, _("Uppercase letters are not allowed here.") 
    7777 
    7878def isUpperCase(field_data, all_data): 
    7979    if field_data.upper() != field_data: 
    80         raise ValidationError, ugettext("Lowercase letters are not allowed here.") 
     80        raise ValidationError, _("Lowercase letters are not allowed here.") 
    8181 
    8282def isCommaSeparatedIntegerList(field_data, all_data): 
    …… 
    8585            int(supposed_int) 
    8686        except ValueError: 
    87             raise ValidationError, ugettext("Enter only digits separated by commas.") 
     87            raise ValidationError, _("Enter only digits separated by commas.") 
    8888 
    8989def isCommaSeparatedEmailList(field_data, all_data): 
    …… 
    9797            isValidEmail(supposed_email.strip(), '') 
    9898        except ValidationError: 
    99             raise ValidationError, ugettext("Enter valid e-mail addresses separated by commas.") 
     99            raise ValidationError, _("Enter valid e-mail addresses separated by commas.") 
    100100 
    101101def isValidIPAddress4(field_data, all_data): 
    102102    if not ip4_re.search(field_data): 
    103         raise ValidationError, ugettext("Please enter a valid IP address.") 
     103        raise ValidationError, _("Please enter a valid IP address.") 
    104104 
    105105def isNotEmpty(field_data, all_data): 
    106106    if field_data.strip() == '': 
    107         raise ValidationError, ugettext("Empty values are not allowed here.") 
     107        raise ValidationError, _("Empty values are not allowed here.") 
    108108 
    109109def isOnlyDigits(field_data, all_data): 
    110110    if not field_data.isdigit(): 
    111         raise ValidationError, ugettext("Non-numeric characters aren't allowed here.") 
     111        raise ValidationError, _("Non-numeric characters aren't allowed here.") 
    112112 
    113113def isNotOnlyDigits(field_data, all_data): 
    114114    if field_data.isdigit(): 
    115         raise ValidationError, ugettext("This value can't be comprised solely of digits.") 
     115        raise ValidationError, _("This value can't be comprised solely of digits.") 
    116116 
    117117def isInteger(field_data, all_data): 
    118118    # This differs from isOnlyDigits because this accepts the negative sign 
    119119    if not integer_re.search(field_data): 
    120         raise ValidationError, ugettext("Enter a whole number.") 
     120        raise ValidationError, _("Enter a whole number.") 
    121121 
    122122def isOnlyLetters(field_data, all_data): 
    123123    if not field_data.isalpha(): 
    124         raise ValidationError, ugettext("Only alphabetical characters are allowed here.") 
     124        raise ValidationError, _("Only alphabetical characters are allowed here.") 
    125125 
    126126def _isValidDate(date_string): 
    …… 
    137137    # value to the database, and strftime requires that the year be >=1900. 
    138138    if year < 1900: 
    139         raise ValidationError, ugettext('Year must be 1900 or later.') 
     139        raise ValidationError, _('Year must be 1900 or later.') 
    140140    try: 
    141141        date(year, month, day) 
    142142    except ValueError, e: 
    143         msg = ugettext('Invalid date: %s') % ugettext(str(e)) 
     143        msg = _('Invalid date: %s') % _(str(e)) 
    144144        raise ValidationError, msg     
    145145 
    146146def isValidANSIDate(field_data, all_data): 
    147147    if not ansi_date_re.search(field_data): 
    148         raise ValidationError, ugettext('Enter a valid date in YYYY-MM-DD format.') 
     148        raise ValidationError, _('Enter a valid date in YYYY-MM-DD format.') 
    149149    _isValidDate(field_data) 
    150150 
    151151def isValidANSITime(field_data, all_data): 
    152152    if not ansi_time_re.search(field_data): 
    153         raise ValidationError, ugettext('Enter a valid time in HH:MM format.') 
     153        raise ValidationError, _('Enter a valid time in HH:MM format.') 
    154154 
    155155def isValidANSIDatetime(field_data, all_data): 
    156156    if not ansi_datetime_re.search(field_data): 
    157         raise ValidationError, ugettext('Enter a valid date/time in YYYY-MM-DD HH:MM format.') 
     157        raise ValidationError, _('Enter a valid date/time in YYYY-MM-DD HH:MM format.') 
    158158    _isValidDate(field_data.split()[0]) 
    159159 
    160160def isValidEmail(field_data, all_data): 
    161161    if not email_re.search(field_data): 
    162         raise ValidationError, ugettext('Enter a valid e-mail address.') 
     162        raise ValidationError, _('Enter a valid e-mail address.') 
    163163 
    164164def isValidImage(field_data, all_data): 
    …… 
    172172        content = field_data['content'] 
    173173    except TypeError: 
    174         raise ValidationError, ugettext("No file was submitted. Check the encoding type on the form.") 
     174        raise ValidationError, _("No file was submitted. Check the encoding type on the form.") 
    175175    try: 
    176176        Image.open(StringIO(content)) 
    177177    except IOError: # Python Imaging Library doesn't recognize it as an image 
    178         raise ValidationError, ugettext("Upload a valid image. The file you uploaded was either not an image or a corrupted image.") 
     178        raise ValidationError, _("Upload a valid image. The file you uploaded was either not an image or a corrupted image.") 
    179179 
    180180def isValidImageURL(field_data, all_data): 
    …… 
    183183        uc(field_data, all_data) 
    184184    except URLMimeTypeCheck.InvalidContentType: 
    185         raise ValidationError, ugettext("The URL %s does not point to a valid image.") % field_data 
     185        raise ValidationError, _("The URL %s does not point to a valid image.") % field_data 
    186186 
    187187def isValidPhone(field_data, all_data): 
    188188    if not phone_re.search(field_data): 
    189         raise ValidationError, ugettext('Phone numbers must be in XXX-XXX-XXXX format. "%s" is invalid.') % field_data 
     189        raise ValidationError, _('Phone numbers must be in XXX-XXX-XXXX format. "%s" is invalid.') % field_data 
    190190 
    191191def isValidQuicktimeVideoURL(field_data, all_data): 
    …… 
    195195        uc(field_data, all_data) 
    196196    except URLMimeTypeCheck.InvalidContentType: 
    197         raise ValidationError, ugettext("The URL %s does not point to a valid QuickTime video.") % field_data 
     197        raise ValidationError, _("The URL %s does not point to a valid QuickTime video.") % field_data 
    198198 
    199199def isValidURL(field_data, all_data): 
    200200    if not url_re.search(field_data): 
    201         raise ValidationError, ugettext("A valid URL is required.") 
     201        raise ValidationError, _("A valid URL is required.") 
    202202 
    203203def isValidHTML(field_data, all_data): 
    …… 
    213213    from xml.dom.minidom import parseString 
    214214    error_messages = [e.firstChild.wholeText for e in parseString(u.read()).getElementsByTagName('messages')[0].getElementsByTagName('msg')] 
    215     raise ValidationError, ugettext("Valid HTML is required. Specific errors are:\n%s") % "\n".join(error_messages) 
     215    raise ValidationError, _("Valid HTML is required. Specific errors are:\n%s") % "\n".join(error_messages) 
    216216 
    217217def isWellFormedXml(field_data, all_data): 
    …… 
    220220        parseString(field_data) 
    221221    except Exception, e: # Naked except because we're not sure what will be thrown 
    222         raise ValidationError, ugettext("Badly formed XML: %s") % str(e) 
     222        raise ValidationError, _("Badly formed XML: %s") % str(e) 
    223223 
    224224def isWellFormedXmlFragment(field_data, all_data): 
    …… 
    250250    states = ['AA', 'AE', 'AK', 'AL', 'AP', 'AR', 'AS', 'AZ', 'CA', 'CO', 'CT', 'DC', 'DE', 'FL', 'FM', 'GA', 'GU', 'HI', 'IA', 'ID', 'IL', 'IN', 'KS', 'KY', 'LA', 'MA', 'MD', 'ME', 'MH', 'MI', 'MN', 'MO', 'MP', 'MS', 'MT', 'NC', 'ND', 'NE', 'NH', 'NJ', 'NM', 'NV', 'NY', 'OH', 'OK', 'OR', 'PA', 'PR', 'PW', 'RI', 'SC', 'SD', 'TN', 'TX', 'UT', 'VA', 'VI', 'VT', 'WA', 'WI', 'WV', 'WY'] 
    251251    if field_data.upper() not in states: 
    252         raise ValidationError, ugettext("Enter a valid U.S. state abbreviation.") 
     252        raise ValidationError, _("Enter a valid U.S. state abbreviation.") 
    253253 
    254254def hasNoProfanities(field_data, all_data): 
    …… 
    365365        if not error_message: 
    366366            if lower and upper: 
    367                  self.error_message = ugettext("This value must be between %(lower)s and %(upper)s.") % {'lower': lower, 'upper': upper} 
     367                 self.error_message = _("This value must be between %(lower)s and %(upper)s.") % {'lower': lower, 'upper': upper} 
    368368            elif lower: 
    369                 self.error_message = ugettext("This value must be at least %s.") % lower 
     369                self.error_message = _("This value must be at least %s.") % lower 
    370370            elif upper: 
    371                 self.error_message = ugettext("This value must be no more than %s.") % upper 
     371                self.error_message = _("This value must be no more than %s.") % upper 
    372372        else: 
    373373            self.error_message = error_message 
    …… 
    405405        val = log(int(field_data)) / log(self.power_of) 
    406406        if val != int(val): 
    407             raise ValidationError, ugettext("This value must be a power of %s.") % self.power_of 
     407            raise ValidationError, _("This value must be a power of %s.") % self.power_of 
    408408 
    409409class IsValidFloat(object): 
    …… 
    416416            float(data) 
    417417        except ValueError: 
    418             raise ValidationError, ugettext("Please enter a valid decimal number.") 
     418            raise ValidationError, _("Please enter a valid decimal number.") 
    419419        # Negative floats require more space to input. 
    420420        max_allowed_length = data.startswith('-') and (self.max_digits + 2) or (self.max_digits + 1) 
    …… 
    505505            info = urllib2.urlopen(field_data).info() 
    506506        except (urllib2.HTTPError, urllib2.URLError): 
    507             raise URLMimeTypeCheck.CouldNotRetrieve, ugettext("Could not retrieve anything from %s.") % field_data 
     507            raise URLMimeTypeCheck.CouldNotRetrieve, _("Could not retrieve anything from %s.") % field_data 
    508508        content_type = info['content-type'] 
    509509        if content_type not in self.mime_type_list: 
    510             raise URLMimeTypeCheck.InvalidContentType, ugettext("The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'.") % { 
     510            raise URLMimeTypeCheck.InvalidContentType, _("The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'.") % { 
    511511                'url': field_data, 'contenttype': content_type} 
    512512 

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

    r5203 r5230  
    99from django.utils.itercompat import tee 
    1010from django.utils.text import capfirst 
    11 from django.utils.translation import ugettext, ugettext_lazy 
     11from django.utils.translation import ugettext_lazy, ugettext as _ 
    1212from django.utils.encoding import smart_unicode 
    1313import datetime, os, time 
    …… 
    4141    if getattr(self, 'original_object', None) and self.original_object._get_pk_val() == old_obj._get_pk_val(): 
    4242        return 
    43     raise validators.ValidationError, ugettext("%(optname)s with this %(fieldname)s already exists.") % {'optname': capfirst(opts.verbose_name), 'fieldname': f.verbose_name} 
     43    raise validators.ValidationError, _("%(optname)s with this %(fieldname)s already exists.") % {'optname': capfirst(opts.verbose_name), 'fieldname': f.verbose_name} 
    4444 
    4545# A guide to Field parameters: 
    …… 
    368368            return int(value) 
    369369        except (TypeError, ValueError): 
    370             raise validators.ValidationError, ugettext("This value must be an integer.") 
     370            raise validators.ValidationError, _("This value must be an integer.") 
    371371 
    372372    def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=False, follow=True): 
    …… 
    403403        if value in ('t', 'True', '1'): return True 
    404404        if value in ('f', 'False', '0'): return False 
    405         raise validators.ValidationError, ugettext("This value must be either True or False.") 
     405        raise validators.ValidationError, _("This value must be either True or False.") 
    406406 
    407407    def get_manipulator_field_objs(self): 
    …… 
    458458            return datetime.date(*time.strptime(value, '%Y-%m-%d')[:3]) 
    459459        except ValueError: 
    460             raise validators.ValidationError, ugettext('Enter a valid date in YYYY-MM-DD format.') 
     460            raise validators.ValidationError, _('Enter a valid date in YYYY-MM-DD format.') 
    461461 
    462462    def get_db_prep_lookup(self, lookup_type, value): 
    …… 
    527527                    return datetime.datetime(*time.strptime(value, '%Y-%m-%d')[:3]) 
    528528                except ValueError: 
    529                     raise validators.ValidationError, ugettext('Enter a valid date/time in YYYY-MM-DD HH:MM format.') 
     529                    raise validators.ValidationError, _('Enter a valid date/time in YYYY-MM-DD HH:MM format.') 
    530530 
    531531    def get_db_prep_save(self, value): 
    …… 
    752752        if value in ('t', 'True', '1'): return True 
    753753        if value in ('f', 'False', '0'): return False 
    754         raise validators.ValidationError, ugettext("This value must be either None, True or False.") 
     754        raise validators.ValidationError, _("This value must be either None, True or False.") 
    755755 
    756756    def get_manipulator_field_objs(self): 

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

    r5229 r5230  
    44from django.db.models.related import RelatedObject 
    55from django.utils.text import capfirst 
    6 from django.utils.translation import ugettext_lazy, string_concat, ungettext 
     6from django.utils.translation import ugettext_lazy, string_concat, ungettext, ugettext as _ 
    77from django.utils.functional import curry 
    88from django.utils.encoding import smart_unicode 

  • django/branches/unicode/django/db/models/manipulators.py

    r5090 r5230  
    99from django.utils.text import capfirst 
    1010from django.utils.encoding import smart_str 
     11from django.utils.translation import ugettext as _ 
    1112import types 
    1213 

  • django/branches/unicode/django/oldforms/__init__.py

    r5192 r5230  
    585585    def __init__(self, field_name, is_required=False, validator_list=None): 
    586586        if validator_list is None: validator_list = [] 
    587         SelectField.__init__(self, field_name, choices=[('1', _('Unknown')), ('2', _('Yes')), ('3', _('No'))], 
     587        SelectField.__init__(self, field_name, choices=[('1', ugettext('Unknown')), ('2', ugettext('Yes')), ('3', ugettext('No'))], 
    588588            is_required=is_required, validator_list=validator_list) 
    589589 

  • django/branches/unicode/django/template/__init__.py

    r5199 r5230  
    6262from django.utils.text import smart_split 
    6363from django.utils.encoding import smart_unicode, smart_str 
     64from django.utils.translation import ugettext as _ 
    6465 
    6566__all__ = ('Template', 'Context', 'RequestContext', 'compile_string') 

  • django/branches/unicode/django/utils/translation/trans_real.py

    r5126 r5230  
    381381    """ 
    382382    from django.conf import settings 
    383     date_format = _('DATE_FORMAT') 
    384     datetime_format = _('DATETIME_FORMAT') 
    385     time_format = _('TIME_FORMAT') 
     383    date_format = ugettext('DATE_FORMAT') 
     384    datetime_format = ugettext('DATETIME_FORMAT') 
     385    time_format = ugettext('TIME_FORMAT') 
    386386    if date_format == 'DATE_FORMAT': 
    387387        date_format = settings.DATE_FORMAT 
    …… 
    399399    """ 
    400400    from django.conf import settings 
    401     year_month_format = _('YEAR_MONTH_FORMAT') 
    402     month_day_format = _('MONTH_DAY_FORMAT') 
     401    year_month_format = ugettext('YEAR_MONTH_FORMAT') 
     402    month_day_format = ugettext('MONTH_DAY_FORMAT') 
    403403    if year_month_format == 'YEAR_MONTH_FORMAT': 
    404404        year_month_format = settings.YEAR_MONTH_FORMAT 

  • django/branches/unicode/tests/regressiontests/templates/tests.py

    r5185 r5230  
    99from django import template 
    1010from django.template import loader 
    11 from django.utils.translation import activate, deactivate, install 
     11from django.utils.translation import activate, deactivate, install, ugettext as _ 
    1212from django.utils.tzinfo import LocalTimezone 
    1313from datetime import datetime, timedelta