Merge branch 'master' into fix-2982-harder

ralsina · web-flow · commit a5325cb357b8 · 2018-03-17T13:51:05.000-03:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -36,6 +36,7 @@ Bugfixes
 
 * Handle '/' and other absolute paths better in POSTS / PAGES / TRANSLATIONS 
   (Issue #2982)
+* Fix loading non-default languages
 * Support KaTeX for reST display math (Issue #2888)
 * Use npm for asset management instead of bower, which was deprecated
   (Issue #2790)
diff --git a/nikola/utils.py b/nikola/utils.py
@@ -705,28 +705,29 @@ def load_messages(themes, translations, default_lang, themes_dirs):
         default_folder = os.path.join(get_theme_path_real('base', themes_dirs), 'messages')
         sys.path.insert(0, default_folder)
         sys.path.insert(0, msg_folder)
-        english = __import__('messages_en')
-        # If we don't do the reload, the module is cached
-        _reload(english)
-        for lang in list(translations.keys()):
-            try:
-                translation = __import__('messages_' + lang)
-                # If we don't do the reload, the module is cached
-                _reload(translation)
-                if sorted(translation.MESSAGES.keys()) !=\
-                        sorted(english.MESSAGES.keys()) and \
-                        lang not in language_incomplete_warned:
-                    language_incomplete_warned.append(lang)
-                    LOGGER.warn("Incomplete translation for language "
-                                "'{0}'.".format(lang))
-                messages[lang].update(english.MESSAGES)
-                for k, v in translation.MESSAGES.items():
-                    if v:
-                        messages[lang][k] = v
-                del(translation)
-            except ImportError as orig:
-                raise LanguageNotFoundError(lang, orig)
-        del(english)
+
+    english = __import__('messages_en')
+    # If we don't do the reload, the module is cached
+    _reload(english)
+    for lang in list(translations.keys()):
+        try:
+            translation = __import__('messages_' + lang)
+            # If we don't do the reload, the module is cached
+            _reload(translation)
+            if sorted(translation.MESSAGES.keys()) !=\
+                    sorted(english.MESSAGES.keys()) and \
+                    lang not in language_incomplete_warned:
+                language_incomplete_warned.append(lang)
+                LOGGER.warn("Incomplete translation for language "
+                            "'{0}'.".format(lang))
+            messages[lang].update(english.MESSAGES)
+            for k, v in translation.MESSAGES.items():
+                if v:
+                    messages[lang][k] = v
+            del(translation)
+        except ImportError as orig:
+            raise LanguageNotFoundError(lang, orig)
+    del(english)
     sys.path = oldpath
     return messages
 
