Ticket #8033: better_error_handling_for_ugettext_r8138.3.diff

django/core/handlers/base.py

@@ -62 +62 @@
         "Returns an HttpResponse object for the given HttpRequest"
         from django.core import exceptions, urlresolvers
         from django.conf import settings
+        from django.db.models.loading import get_apps
 
+        # Force app loading
+        get_apps()
+
         # Apply request middleware
         for middleware_method in self._request_middleware:
             response = middleware_method(request)

django/core/exceptions.py

@@ -28 +28 @@
     "Django is somehow improperly configured"
     pass
 
+class ImproperlyImplemented(Exception):
+    "Django is somehow improperly implemented"
+    pass
+
 class FieldError(Exception):
     """Some kind of problem with a model field."""
     pass

django/views/debug.py

@@ -60 +60 @@
 
     def get_traceback_html(self):
         "Return HTML code for traceback."
+        from django.utils import translation
+        translation.deactivate_all() # avoid possible translation errors in 500 error handling
 
         if issubclass(self.exc_type, TemplateDoesNotExist):
             from django.template.loader import template_source_loaders

django/utils/translation/trans_real.py

@@ -7 +7 @@
 import gettext as gettext_module
 from cStringIO import StringIO
 
+from django.core.exceptions import ImproperlyImplemented
+from django.db.models.loading import app_cache_ready, get_apps
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.thread_support import currentThread
 
@@ -270 +272 @@
     """
     global _default, _active
     t = _active.get(currentThread(), None)
+    if not app_cache_ready() and \
+       not isinstance(t, gettext_module.NullTranslations):
+        raise ImproperlyImplemented(
+            "django.utils.translation.%(func_name)s function called at "
+            "import time to perform a translation of '%(message)s'. "
+            "%(func_name)s function must be called after "
+            "applications loading." % {'func_name': translation_function,
+                                       'message': message})
     if t is not None:
         result = getattr(t, translation_function)(message)
     else: