From 71319942d99749e888686cf9efd92428da499771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 29 May 2015 18:23:16 +0200 Subject: [PATCH] Fix: Don't have plugin i18n paths overwrite the core i18n path Stopped translations bundled with OctoPrint to work --- src/octoprint/server/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index 8733a7df..6f9e5f19 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -512,8 +512,8 @@ def localeJs(locale, domain): plugins = octoprint.plugin.plugin_manager().enabled_plugins for name, plugin in plugins.items(): - base_path = os.path.join(plugin.location, 'translations') - plugin_messages, _ = messages_from_po(base_path, locale, domain) + plugin_path = os.path.join(plugin.location, 'translations') + plugin_messages, _ = messages_from_po(plugin_path, locale, domain) messages = octoprint.util.dict_merge(messages, plugin_messages) core_messages, plural_expr = messages_from_po(base_path, locale, domain)