Merge pull request #687 from pascalchevrel/Bug851545-download_button_default_lang_file

replace call to base.lang by call to download_button.lang

lib/l10n_utils/tests/test_template.py

@@ -79,7 +79,7 @@ class TestTemplateLangFiles(TestCase):
         request = type('request', (), {})()
         template.render(request=request)
         eq_(request.langfiles, ['dude', 'walter',
-                                'main', 'base', 'newsletter'])
+                                'main', 'download_button', 'newsletter'])
 
     @patch.object(env, 'loader', FileSystemLoader(TEMPLATE_DIRS))
     def test_added_lang_files_inheritance(self):
@@ -96,7 +96,7 @@ class TestTemplateLangFiles(TestCase):
         request = type('request', (), {})()
         template.render(request=request)
         eq_(request.langfiles, ['donnie', 'smokey', 'jesus', 'dude', 'walter',
-                                'main', 'base', 'newsletter'])
+                                'main', 'download_button', 'newsletter'])
 
     @patch.object(env, 'loader', FileSystemLoader(TEMPLATE_DIRS))
     @patch.object(settings, 'ROOT_URLCONF', 'l10n_utils.tests.test_files.urls')
@@ -110,7 +110,7 @@ class TestTemplateLangFiles(TestCase):
         """
         self.client.get('/de/some-lang-files/')
         translate.assert_called_with(ANY, ['dude', 'walter', 'some_lang_files',
-                                           'main', 'base', 'newsletter'])
+                                           'main', 'download_button', 'newsletter'])
 
     @patch.object(env, 'loader', FileSystemLoader(TEMPLATE_DIRS))
     @patch.object(settings, 'ROOT_URLCONF', 'l10n_utils.tests.test_files.urls')
@@ -123,4 +123,4 @@ class TestTemplateLangFiles(TestCase):
         """
         self.client.get('/de/active-de-lang-file/')
         translate.assert_called_with(ANY, ['active_de_lang_file', 'main',
-                                           'base', 'newsletter'])
+                                           'download_button', 'newsletter'])

settings/base.py

@@ -39,7 +39,7 @@ NEWSLETTER_LANGUAGES = ['de', 'en', 'es', 'fr', 'id', 'pt', 'ru']
 FEED_CACHE = 3900
 DOTLANG_CACHE = 60
 
-DOTLANG_FILES = ['main', 'base', 'newsletter']
+DOTLANG_FILES = ['main', 'download_button', 'newsletter']
 
 # Paths that don't require a locale code in the URL.
 # matches the first url component (e.g. mozilla.org/gameon/)