diff -r 57b4279d8c4e -r 03e267d67478 app/django/utils/translation/__init__.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/django/utils/translation/__init__.py	Fri Jul 18 18:22:23 2008 +0000
@@ -0,0 +1,111 @@
+"""
+Internationalization support.
+"""
+from django.utils.functional import lazy
+from django.utils.encoding import force_unicode
+
+__all__ = ['gettext', 'gettext_noop', 'gettext_lazy', 'ngettext',
+        'ngettext_lazy', 'string_concat', 'activate', 'deactivate',
+        'get_language', 'get_language_bidi', 'get_date_formats',
+        'get_partial_date_formats', 'check_for_language', 'to_locale',
+        'get_language_from_request', 'templatize', 'ugettext',
+        'ungettext', 'deactivate_all']
+
+# Here be dragons, so a short explanation of the logic won't hurt:
+# We are trying to solve two problems: (1) access settings, in particular
+# settings.USE_I18N, as late as possible, so that modules can be imported
+# without having to first configure Django, and (2) if some other code creates
+# a reference to one of these functions, don't break that reference when we
+# replace the functions with their real counterparts (once we do access the
+# settings).
+
+def delayed_loader(*args, **kwargs):
+    """
+    Replace each real_* function with the corresponding function from either
+    trans_real or trans_null (e.g. real_gettext is replaced with
+    trans_real.gettext or trans_null.gettext). This function is run once, the
+    first time any i18n method is called. It replaces all the i18n methods at
+    once at that time.
+    """
+    import traceback
+    from django.conf import settings
+    if settings.USE_I18N:
+        import trans_real as trans
+    else:
+        import trans_null as trans
+    caller = traceback.extract_stack(limit=2)[0][2]
+    g = globals()
+    for name in __all__:
+        if hasattr(trans, name):
+            g['real_%s' % name] = getattr(trans, name)
+
+    # Make the originally requested function call on the way out the door.
+    return g['real_%s' % caller](*args, **kwargs)
+
+g = globals()
+for name in __all__:
+    g['real_%s' % name] = delayed_loader
+del g, delayed_loader
+
+def gettext_noop(message):
+    return real_gettext_noop(message)
+
+ugettext_noop = gettext_noop
+
+def gettext(message):
+    return real_gettext(message)
+
+def ngettext(singular, plural, number):
+    return real_ngettext(singular, plural, number)
+
+def ugettext(message):
+    return real_ugettext(message)
+
+def ungettext(singular, plural, number):
+    return real_ungettext(singular, plural, number)
+
+ngettext_lazy = lazy(ngettext, str)
+gettext_lazy = lazy(gettext, str)
+ungettext_lazy = lazy(ungettext, unicode)
+ugettext_lazy = lazy(ugettext, unicode)
+
+def activate(language):
+    return real_activate(language)
+
+def deactivate():
+    return real_deactivate()
+
+def get_language():
+    return real_get_language()
+
+def get_language_bidi():
+    return real_get_language_bidi()
+
+def get_date_formats():
+    return real_get_date_formats()
+
+def get_partial_date_formats():
+    return real_get_partial_date_formats()
+
+def check_for_language(lang_code):
+    return real_check_for_language(lang_code)
+
+def to_locale(language):
+    return real_to_locale(language)
+
+def get_language_from_request(request):
+    return real_get_language_from_request(request)
+
+def templatize(src):
+    return real_templatize(src)
+
+def deactivate_all():
+    return real_deactivate_all()
+
+def string_concat(*strings):
+    """
+    Lazy variant of string concatenation, needed for translations that are
+    constructed from multiple parts.
+    """
+    return u''.join([force_unicode(s) for s in strings])
+string_concat = lazy(string_concat, unicode)