Index: django/core/context_processors.py
===================================================================
--- django/core/context_processors.py	(revision 7438)
+++ django/core/context_processors.py	(working copy)
@@ -40,12 +40,9 @@
 def i18n(request):
     context_extras = {}
     context_extras['LANGUAGES'] = settings.LANGUAGES
-    if hasattr(request, 'LANGUAGE_CODE'):
-        context_extras['LANGUAGE_CODE'] = request.LANGUAGE_CODE
-    else:
-        context_extras['LANGUAGE_CODE'] = settings.LANGUAGE_CODE
 
     from django.utils import translation
+    context_extras['LANGUAGE_CODE'] = translation.get_language()
     context_extras['LANGUAGE_BIDI'] = translation.get_language_bidi()
 
     return context_extras