BabelDjango: the middleware now falls back to settings.LANGUAGE_CODE when the Django LocaleMiddleware hasn't done its thing.

git-svn-id: http://svn.edgewall.org/repos/babel/contrib/django@294 59ecc08e-a131-0410-9ea7-d4c0f28ac310

Author: cmlenz

babeldjango/middleware.py

@@ -12,6 +12,7 @@
 # history and logs, available at http://babel.edgewall.org/log/.
 
 from babel import Locale, UnknownLocaleError
+from django.conf import settings
 try:
     from threading import local
 except ImportError:
@@ -37,7 +38,8 @@ class LocaleMiddleware(object):
 
     def process_request(self, request):
         try:
-            locale = Locale.parse(request.LANGUAGE_CODE, sep='-')
+            code = getattr(request, 'LANGUAGE_CODE', settings.LANGUAGE_CODE)
+            locale = Locale.parse(code, sep='-')
         except (ValueError, UnknownLocaleError):
             pass
         else:

setup.py

@@ -20,7 +20,7 @@
 setup(
     name = 'BabelDjango',
     description = 'Utilities for using Babel in Django',
-    version = '0.1',
+    version = '0.2',
     license = 'BSD',
     author  = 'Edgewall Software',
     author_email = '[email protected]',