Changeset 3247

Timestamp:

06/30/06 22:09:14 (2 years ago)

Author:

adrian

Message:

Added USE_I18N setting, which lets you turn off internationalization overhead with a single setting. Defaults to True. Currently only affects the admin i18n JavaScript?, but I'll be adding other optimizations.

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/contrib/admin/urls.py (modified) (2 diffs)
• django/trunk/django/views/i18n.py (modified) (2 diffs)
• django/trunk/docs/i18n.txt (modified) (1 diff)
• django/trunk/docs/settings.txt (modified) (1 diff)

django/trunk/django/conf/global_settings.py

@@ -68 +68 @@
-LANGUAGES_BIDI = ("he",)
-
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
-# Not-necessarily-technical managers of the site. They get broken link
-# notifications and other various e-mails.

django/trunk/django/contrib/admin/urls.py

@@ +1 @@
+from django.conf import settings
-from django.conf.urls.defaults import *
+
+if settings.USE_I18N:
+    i18n_view = 'django.views.i18n.javascript_catalog'
+else:
+    i18n_view = 'django.views.i18n.null_javascript_catalog'
-
-urlpatterns = patterns('',
-    ('^$', 'django.contrib.admin.views.main.index'),
-    ('^r/(\d+)/(.*)/$', 'django.views.defaults.shortcut'),
-'django.views.i18n.javascript_catalog'
+i18n_view
-    ('^logout/$', 'django.contrib.auth.views.logout'),
-    ('^password_change/$', 'django.contrib.auth.views.password_change'),
@@ -30 +36 @@
-    ('^([^/]+)/([^/]+)/(.+)/$', 'django.contrib.admin.views.main.change_stage'),
-)
+
+del i18n_view

django/trunk/django/views/i18n.py

@@ -104 +104 @@
-}
-"""
+
+def null_javascript_catalog(request, domain=None, packages=None):
+    """
+    Returns "identity" versions of the JavaScript i18n functions -- i.e.,
+    versions that don't actually do anything.
+    """
+    return http.HttpResponse(NullSource + InterPolate, 'text/javascript')
-
-def javascript_catalog(request, domain='djangojs', packages=None):
@@ -192 +199 @@
-    src = ''.join(src)
-    return http.HttpResponse(src, 'text/javascript')
-

django/trunk/docs/i18n.txt

@@ -36 +36 @@
-    3. Activate the locale middleware in your Django settings.
-
-
-.. admonition:: Behind the scenes
-
-    Django's translation machinery uses the standard ``gettext`` module that
-    comes with Python.
+
+If you don't need internationalization
+======================================
+
+Django's internationalization hooks are on by default, and that means there's a
+bit of i18n-related overhead in certain places of the framework. If you don't
+use internationalization, you should take the two seconds to set
+``USE_I18N = False`` in your settings file. If ``USE_I18N`` is set to
+``False``, then Django will make some optimizations so as not to load the
+internationalization machinery.
+
+See the `documentation for USE_I18N`_.
+
+.. _documentation for USE_I18N: http://www.djangoproject.com/documentation/settings/#use-i18n
-
-How to specify translation strings

django/trunk/docs/settings.txt

@@ -739 +739 @@
-is installed (see the `middleware docs`_).
-
+USE_I18N
+--------
+
+Default: ``True``
+
+A boolean that specifies whether Django's internationalization system should be
+enabled. This provides an easy way to turn it off, for performance. If this is
+set to ``False, Django will make some optimizations so as not to load the
+internationalization machinery.
+
-YEAR_MONTH_FORMAT
------------------