Let developer chose wether or not to translate LANGUAGES

noirbizarre · noirbizarre · commit 358120f0ea8c · 2013-10-11T17:02:18.000+02:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,7 @@ Current
 - Allow customizable Django.js initialization
 - Allow manual reload of context and URLs
 - Published Django.js on bower (thanks to Wasil Sergejczyk for the initial bower.json file)
+- Do not automatically translate languages name in context
 
 
 0.8.0 (2013-07-14)
diff --git a/djangojs/context_serializer.py b/djangojs/context_serializer.py
@@ -6,7 +6,6 @@
 
 from django.template.context import RequestContext
 from django.utils import translation, six
-from django.utils.translation import ugettext_lazy as _
 
 from djangojs.conf import settings
 from djangojs.utils import LazyJsonEncoder
@@ -65,7 +64,7 @@ def as_json(self):
 
     def process_LANGUAGES(self, languages, data):
         '''Serialize LANGUAGES as a localized dictionnary.'''
-        return dict((code, _(name)) for code, name in languages)
+        return dict(languages)
 
     def process_LANGUAGE_CODE(self, language_code, data):
         '''
diff --git a/djangojs/tests/test_context.py b/djangojs/tests/test_context.py
@@ -14,6 +14,7 @@
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
+from django.utils import six
 from django.utils import translation
 from django.utils import unittest
 
@@ -130,16 +131,15 @@ def test_languages(self):
         for code, name in settings.LANGUAGES:
             self.assertEqual(languages[code], name)
 
-    @override_settings(LANGUAGE_CODE='en-us')
-    def test_languages_localized(self):
-        '''LANGUAGES should be localized'''
+    @override_settings(LANGUAGE_CODE='en-us', LANGUAGES=[('fr', translation.ugettext_lazy('French'))])
+    def test_ugettext_lazy(self):
+        '''Serialization should not fail on lazy translations'''
         result = self.process_request(headers={'HTTP_ACCEPT_LANGUAGE': 'fr'})
         self.assertIn('LANGUAGES', result)
         languages = result['LANGUAGES']
         self.assertTrue(isinstance(languages, dict))
-        translation.activate('fr')
-        for code, name in settings.LANGUAGES:
-            self.assertEqual(languages[code], translation.ugettext_lazy(name))
+        self.assertTrue(isinstance(languages['fr'], six.text_type))
+        self.assertEqual(languages['fr'], 'Français')
 
     def test_any_custom_context_processor(self):
         '''Any custom context processor should be in context'''
