Changeset 6582

Timestamp:

10/21/07 12:14:25 (9 months ago)

Author:

mtredinnick

Message:

Fixed #2920 -- Removed _() from builtins.

This is backwards incompatible, but easy to work around.

Files:

• django/trunk/django/conf/__init__.py (modified) (1 diff)
• django/trunk/django/utils/translation/__init__.py (modified) (2 diffs)
• django/trunk/django/utils/translation/trans_null.py (modified) (1 diff)
• django/trunk/django/utils/translation/trans_real.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (2 diffs)

django/trunk/django/conf/__init__.py

@@ -141 +141 @@
-settings = LazySettings()
-
-# This function replaces itself with django.utils.translation.gettext() the
-# first time it's run. This is necessary because the import of
-# django.utils.translation requires a working settings module, and loading it
-# from within this file would cause a circular import.
-def first_time_gettext(*args):
-    from django.utils.translation import gettext
-    __builtins__['_'] = gettext
-    return gettext(*args)
-
-__builtins__['_'] = first_time_gettext

django/trunk/django/utils/translation/__init__.py

@@ -9 +9 @@
-        'get_language', 'get_language_bidi', 'get_date_formats',
-        'get_partial_date_formats', 'check_for_language', 'to_locale',
-install', '
+
-        'ungettext', 'deactivate_all']
-
@@ -97 +97 @@
-    return real_get_language_from_request(request)
-
-def install():
-    return real_install()
-
-def templatize(src):
-    return real_templatize(src)

django/trunk/django/utils/translation/trans_null.py

@@ -15 +15 @@
-
-activate = lambda x: None
-install = 
+
-get_language = lambda: settings.LANGUAGE_CODE
-get_language_bidi = lambda: settings.LANGUAGE_CODE in settings.LANGUAGES_BIDI

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

@@ -250 +250 @@
-def do_translate(message, translation_function):
-    """
-
-
+
+
+
+
-    """
-    global _default, _active
@@ -263 +265 @@
-
-def gettext(message):
-    """
-    This function will be patched into the builtins module to provide the _
-    helper function. It will use the current thread as a discriminator to find
-    the translation object to use. If no current translation is activated, the
-    message will be run through the default translation object.
-    """
-    return do_translate(message, 'gettext')
-
@@ -414 +410 @@
-        month_day_format = settings.MONTH_DAY_FORMAT
-    return year_month_format, month_day_format
-
-def install():
-    """
-    Installs the gettext function as the default translation function under
-    the name '_'.
-    """
-    __builtins__['_'] = gettext
-
-dot_re = re.compile(r'\S')

django/trunk/tests/regressiontests/templates/tests.py

@@ -14 +14 @@
-from django.template import loader
-from django.template.loaders import app_directories, filesystem
-install, 
+
-from django.utils.tzinfo import LocalTimezone
-
@@ -845 +845 @@
-
-        for name, vals in tests:
-            install()
-
-            if isinstance(vals[2], tuple):
-                normal_string_result = vals[2][0]