Use Django's get_language() method to get the language code for both static

and dynamic translation.

See: #201
Submitted by: Florian Sening


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

Author: jruigrok

babeldjango/middleware.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007 Edgewall Software
+# Copyright (C) 2007-2010 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
@@ -12,7 +12,7 @@
 # history and logs, available at http://babel.edgewall.org/log/.
 
 from babel import Locale, UnknownLocaleError
-from django.conf import settings
+from django.utils.translation import get_language
 try:
     from threading import local
 except ImportError:
@@ -38,7 +38,7 @@ class LocaleMiddleware(object):
 
     def process_request(self, request):
         try:
-            code = getattr(request, 'LANGUAGE_CODE', settings.LANGUAGE_CODE)
+            code = getattr(request, 'LANGUAGE_CODE', get_language())
             locale = Locale.parse(code, sep='-')
         except (ValueError, UnknownLocaleError):
             pass

babeldjango/templatetags/babel.py

@@ -13,7 +13,7 @@
 
 from django.conf import settings
 from django.template import Library
-from django.utils.translation import to_locale
+from django.utils.translation import to_locale, get_language
 try:
     from pytz import timezone
 except ImportError:
@@ -30,7 +30,7 @@
 def _get_format():
     locale = get_current_locale()
     if not locale:
-        locale = Locale.parse(to_locale(settings.LANGUAGE_CODE))
+        locale = Locale.parse(to_locale(get_language()))
     if timezone:
         tzinfo = timezone(settings.TIME_ZONE)
     else: