[#959] ITranslation interface fix

Only add translations strings for the current locale (instead of all).
Allow 'en' translation strings in extensions to overwrite core strings.

ckan/lib/i18n.py

@@ -1,4 +1,5 @@
 import os
+import gettext
 
 from babel import Locale, localedata
 from babel.core import LOCALE_ALIASES
@@ -129,12 +130,6 @@ def _set_lang(lang):
     else:
         i18n.set_lang(lang, class_=Translations)
 
-    for plugin in PluginImplementations(ITranslation):
-        pylons.translator.merge(Translations.load(
-            dirname=plugin.directory(),
-            locales=plugin.locales(),
-            domain=plugin.domain()
-        ))
 
 
 def handle_request(request, tmpl_context):
@@ -143,6 +138,27 @@ def handle_request(request, tmpl_context):
         config.get('ckan.locale_default', 'en')
     if lang != 'en':
         set_lang(lang)
+
+    for plugin in PluginImplementations(ITranslation):
+        if lang in plugin.locales():
+            translator = Translations.load(
+                dirname=plugin.directory(),
+                locales=lang,
+                domain=plugin.domain()
+            )
+            try:
+                pylons.translator.merge(translator)
+            except AttributeError:
+                # this occurs when an extension has 'en' translations that
+                # replace the default strings. As set_lang has not been run,
+                # pylons.translation is the NullTranslation, so we have to
+                # replace the StackedObjectProxy ourselves manually.
+                environ = pylons.request.environ
+                environ['pylons.pylons'].translator = translator
+                if 'paste.registry' in environ:
+                    environ['paste.registry'].replace(pylons.translator,
+                                                      translator)
+
     tmpl_context.language = lang
     return lang
 

ckanext/example_itranslation/tests/test_plugin.py

@@ -31,6 +31,14 @@ def test_translated_string_in_extensions_templates(self):
         assert_true('This is an untranslated string' in response.body)
         assert_false('This is a itranslated string' in response.body)
 
+        # check that we have only overwritten 'fr'
+        response = app.get(
+            url=plugins.toolkit.url_for(controller='home', action='index',
+                                        locale='es'),
+        )
+        assert_true('This is an untranslated string' in response.body)
+        assert_false('This is a itranslated string' in response.body)
+
     def test_translated_string_in_core_templates(self):
         app = self._get_test_app()
         response = app.get(
@@ -39,10 +47,18 @@ def test_translated_string_in_core_templates(self):
         )
         assert_true('Overwritten string in ckan.mo' in response.body)
         assert_false('Connexion' in response.body)
-        
+
         # double check the untranslated strings
         response = app.get(
             url=plugins.toolkit.url_for(controller='home', action='index'),
         )
         assert_true('Log in' in response.body)
         assert_false('Overwritten string in ckan.mo' in response.body)
+
+        # check that we have only overwritten 'fr'
+        response = app.get(
+            url=plugins.toolkit.url_for(controller='home', action='index',
+                                        locale='de'),
+        )
+        assert_true('Einloggen' in response.body)
+        assert_false('Overwritten string in ckan.mo' in response.body)