Merge 8e04a09 into 3d93f7f

ojii · Jan 24, 2016 · a614b5c · a614b5c
2 parents 3d93f7f + 8e04a09
commit a614b5c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/runtests.py b/runtests.py
@@ -18,6 +18,10 @@
             'ENGINE': 'django.db.backends.sqlite3'
         }
     },
+    LANGUAGES = (
+        ('en-us', 'English'),
+        ('it', 'Italian'),
+    ),
     ROOT_URLCONF='runtests',
     SITE_ID=1,
     MIDDLEWARE_CLASSES=[

diff --git a/statictemplate/management/commands/statictemplate.py b/statictemplate/management/commands/statictemplate.py
@@ -47,10 +47,11 @@ def override_middleware():
         has_old = hasattr(settings, 'MIDDLEWARE_CLASSES')
         old = getattr(settings, 'MIDDLEWARE_CLASSES', None)
         settings.MIDDLEWARE_CLASSES = (
-            'django.middleware.common.CommonMiddleware',
             'django.contrib.sessions.middleware.SessionMiddleware',
-            'django.middleware.csrf.CsrfViewMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',
+            'django.middleware.csrf.CsrfViewMiddleware',
+            'django.middleware.locale.LocaleMiddleware',
+            'django.middleware.common.CommonMiddleware',
         )
         yield
         if has_old:
@@ -92,12 +93,10 @@ def add_arguments(self, parser):
 
     def handle(self, template, language=None, extra_request=None, **options):
         request = {}
-        language = options.get('language_code', False)
-        if not language:
-            language = get_language()
+        language_code = options.get('language_code', language)
+        language = language_code or language or get_language()
         if extra_request:
-            request.update(urlparse.parse_qs(extra_request,
-                                             strict_parsing=True))
+            request.update(urlparse.parse_qs(extra_request, strict_parsing=True))
         output = make_static(template, language, request)
         if options.get('output', False):
             with codecs.open(options.get('output'), 'w', 'utf-8') as output_file:

diff --git a/statictemplate/tests.py b/statictemplate/tests.py
@@ -32,7 +32,7 @@ class TestLoader(Loader):
     is_usable = True
     templates = {
         'request': '{% extends "base" %}{% block content %}request '
-                   '{{ request.GET.extra }}{% endblock %}',
+                   '{{ request.GET.extra }} {{ LANGUAGE_CODE }}{% endblock %}',
         'simple': '{% extends "base" %}{% block content %}simple{% endblock %}',
         'base': '{% block head %}head{% endblock %}{% block content %}content{% endblock %}',
     }
@@ -68,9 +68,9 @@ def test_call_command(self):
 
     def test_request_command(self):
         sio = StringIO()
-        call_command('statictemplate', 'request', stdout=sio,
+        call_command('statictemplate', 'request', stdout=sio, language='it',
                      extra_request='extra=extra_request&canonical=1')
-        self.assertEqual(sio.getvalue().strip(), 'headrequest extra_request')
+        self.assertEqual(sio.getvalue().strip(), 'headrequest extra_request it')
 
     def test_file_command(self):
         _, sio = mkstemp()