Changeset 4485

Timestamp:

02/11/07 00:20:52 (2 years ago)

Author:

russellm

Message:

Refs #2920 -- Replaced implicit uses of _() with explicit imports or calls to gettext(). At some point post 0.96, we need to remove the calls that put _ into the builtins.

Files:

• django/trunk/django/contrib/admin/filterspecs.py (modified) (1 diff)
• django/trunk/django/contrib/admin/templatetags/admin_list.py (modified) (1 diff)
• django/trunk/django/contrib/admin/views/auth.py (modified) (1 diff)
• django/trunk/django/contrib/admin/views/decorators.py (modified) (1 diff)
• django/trunk/django/contrib/admin/views/doc.py (modified) (1 diff)
• django/trunk/django/contrib/admin/views/main.py (modified) (1 diff)
• django/trunk/django/contrib/auth/views.py (modified) (1 diff)
• django/trunk/django/contrib/comments/views/comments.py (modified) (1 diff)
• django/trunk/django/contrib/comments/views/karma.py (modified) (1 diff)
• django/trunk/django/core/cache/__init__.py (modified) (1 diff)
• django/trunk/django/core/validators.py (modified) (2 diffs)
• django/trunk/django/db/__init__.py (modified) (1 diff)
• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/django/db/models/fields/related.py (modified) (2 diffs)
• django/trunk/django/db/models/manipulators.py (modified) (1 diff)
• django/trunk/django/http/__init__.py (modified) (1 diff)
• django/trunk/django/oldforms/__init__.py (modified) (1 diff)
• django/trunk/django/test/simple.py (modified) (1 diff)
• django/trunk/django/utils/translation/trans_real.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)

django/trunk/django/contrib/admin/filterspecs.py

@@ -8 +8 @@
-
-from django.db import models
+from django.utils.translation import gettext as _
-import datetime
-

django/trunk/django/contrib/admin/templatetags/admin_list.py

@@ -7 +7 @@
-from django.utils.html import escape
-from django.utils.text import capfirst
-
+, gettext as _
-from django.template import Library
-import datetime

django/trunk/django/contrib/admin/views/auth.py

@@ -7 +7 @@
-from django.http import HttpResponseRedirect
-from django.utils.html import escape
+from django.utils.translation import gettext as _
-
-def user_add_stage(request):

django/trunk/django/contrib/admin/views/decorators.py

@@ -4 +4 @@
-from django.contrib.auth import authenticate, login
-from django.shortcuts import render_to_response
-
+, gettext as _
-import base64, datetime, md5
-import cPickle as pickle

django/trunk/django/contrib/admin/views/doc.py

@@ -10 +10 @@
-from django.contrib.admin import utils
-from django.contrib.sites.models import Site
+from django.utils.translation import gettext as _
-import inspect, os, re
-

django/trunk/django/contrib/admin/views/main.py

@@ -13 +13 @@
-from django.utils.html import escape
-from django.utils.text import capfirst, get_text_list
+from django.utils.translation import gettext as _
-import operator
-

django/trunk/django/contrib/auth/views.py

@@ -8 +8 @@
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME
+from django.utils.translation import gettext as _
-
-def login(request, template_name='registration/login.html'):

django/trunk/django/contrib/comments/views/comments.py

@@ -12 +12 @@
-from django.utils.text import normalize_newlines
-from django.conf import settings
-
+, gettext as _
-import base64, datetime
-

django/trunk/django/contrib/comments/views/karma.py

@@ -3 +3 @@
-from django.template import RequestContext
-from django.contrib.comments.models import Comment, KarmaScore
+from django.utils.translation import gettext as _
-
-def vote(request, comment_id, vote):

django/trunk/django/core/cache/__init__.py

@@ -19 +19 @@
-from django.conf import settings
-from django.core.cache.backends.base import InvalidCacheBackendError
+from django.utils.translation import gettext as _
-
-BACKENDS = {

django/trunk/django/core/validators.py

@@ -236 +236 @@
-        u = urllib2.urlopen(req)
-    except ValueError:
-_
+gettext
-    except urllib2.HTTPError, e:
-        # 401s are valid; they just mean authorization is required.
-        # 301 and 302 are redirects; they just mean look somewhere else.
-        if str(e.code) not in ('401','301','302'):
-_
+gettext
-    except: # urllib2.URLError, httplib.InvalidURL, etc.
-_
+gettext
-        
-def isValidUSState(field_data, all_data):
@@ -538 +538 @@
-            m = re.search(r'Expected "(.*?)" to terminate element starting on line (\d+)', message)
-            if m:
-_
+gettext
-                    {'tag':m.group(1).replace('/', ''), 'line':m.group(2), 'start':lines[int(m.group(2)) - 1][:30]})
-                continue
-            if message.strip() == 'text not allowed here':
-_
+gettext
-                    {'line':line, 'start':lines[int(line) - 1][:30]})
-                continue
-            m = re.search(r'\s*attribute "(.*?)" not allowed at this point; ignored', message)
-            if m:
-_
+gettext
-                    {'attr':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
-                continue
-            m = re.search(r'\s*unknown element "(.*?)"', message)
-            if m:
-_
+gettext
-                    {'tag':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
-                continue
-            if message.strip() == 'required attributes missing':
-_
+gettext
-                    {'line':line, 'start':lines[int(line) - 1][:30]})
-                continue
-            m = re.search(r'\s*bad value for attribute "(.*?)"', message)
-            if m:
-_
+gettext
-                    {'attr':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
-                continue

django/trunk/django/db/__init__.py

@@ -2 +2 @@
-from django.core import signals
-from django.dispatch import dispatcher
+from django.utils.translation import gettext as _
-
-__all__ = ('backend', 'connection', 'DatabaseError')

django/trunk/django/db/models/fields/__init__.py

@@ -617 +617 @@
-            f = os.path.abspath(os.path.join(settings.MEDIA_ROOT, field_data))
-            if not f.startswith(os.path.abspath(os.path.normpath(settings.MEDIA_ROOT))):
-_
+gettext
-        field_list[1].validator_list.append(isWithinMediaRoot)
-        return field_list

django/trunk/django/db/models/fields/related.py

@@ -4 +4 @@
-from django.db.models.related import RelatedObject
-from django.utils.text import capfirst
-
+, gettext
-from django.utils.functional import curry
-from django.core import validators
@@ -51 +51 @@
-        klass._default_manager.get(**{f.rel.field_name: field_data})
-    except klass.DoesNotExist:
-_
+gettext
-
-#HACK

django/trunk/django/db/models/manipulators.py

@@ -8 +8 @@
-from django.utils.datastructures import DotExpandedDict
-from django.utils.text import capfirst
+from django.utils.translation import gettext as _
-import types
-

django/trunk/django/http/__init__.py

@@ -4 +4 @@
-from urllib import urlencode, quote
-from django.utils.datastructures import MultiValueDict
+from django.utils.translation import gettext as _
-
-RESERVED_CHARS="!*'();:@&=+$,/?%#[]"

django/trunk/django/oldforms/__init__.py

@@ -570 +570 @@
-    def __init__(self, field_name, is_required=False, validator_list=None):
-        if validator_list is None: validator_list = []
-_('Unknown')), ('2', _('Yes')), ('3', _
+gettext('Unknown')), ('2', gettext('Yes')), ('3', gettext
-            is_required=is_required, validator_list=validator_list)
-

django/trunk/django/test/simple.py

@@ -4 +4 @@
-from django.test.utils import setup_test_environment, teardown_test_environment
-from django.test.utils import create_test_db, destroy_test_db
+from django.utils.translation import gettext as _
-from django.test.testcases import OutputChecker, DocTestRunner
-

django/trunk/django/utils/translation/trans_real.py

@@ -360 +360 @@
-    """
-    from django.conf import settings
-_
-_
-_
+gettext
+gettext
+gettext
-    if date_format == 'DATE_FORMAT':
-        date_format = settings.DATE_FORMAT
@@ -378 +378 @@
-    """
-    from django.conf import settings
-_
-_
+gettext
+gettext
-    if year_month_format == 'YEAR_MONTH_FORMAT':
-        year_month_format = settings.YEAR_MONTH_FORMAT

django/trunk/tests/regressiontests/defaultfilters/tests.py

@@ -392 +392 @@
-
-from django.template.defaultfilters import *
+from django.utils.translation import gettext as _
-import datetime
-