pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Don't have plugin i18n paths overwrite the core i18n path

Browse source 
Stopped translations bundled with OctoPrint to work
This commit is contained in:
Gina Häußge 2015-05-29 18:23:16 +02:00
parent ff9765f668
commit 71319942d9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/server/__init__.py
View file

@ -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)