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

Allow new locales to be provided by plugins

Browse source 
Core translations still win over plugin translations, but at least
this way it's possible to provide full blown translations via plugins.
This commit is contained in:
Gina Häußge 2017-01-25 16:02:25 +01:00
parent 9a464e01d8
commit 29a2c6abec
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/octoprint/server/util/flask.py
View file

@ -62,12 +62,18 @@ def enable_additional_translations(default_locale="en", additional_folders=None)
continue
if filter(lambda x: x.name.endswith('.mo'), scandir(locale_dir)):
result.append(Locale.parse(entry.name))
if not result:
result.append(Locale.parse(self._default_locale))
return result
dirs = additional_folders + [os.path.join(self.app.root_path, 'translations')]
# translations from plugins
plugins = octoprint.plugin.plugin_manager().enabled_plugins
for name, plugin in plugins.items():
plugin_translation_dir = os.path.join(plugin.location, 'translations')
if not os.path.isdir(plugin_translation_dir):
continue
dirs.append(plugin_translation_dir)
result = [Locale.parse(default_locale)]
for dir in dirs:
@ -104,20 +110,20 @@ def enable_additional_translations(default_locale="en", additional_folders=None)
else:
if isinstance(plugin_translations, support.Translations):
translations = translations.merge(plugin_translations)
logger.debug("Using translation folder {dirname} for locale {locale} of plugin {name}".format(**locals()))
logger.debug("Using translation plugin folder {dirname} from plugin {name} for locale {locale}".format(**locals()))
break
else:
logger.debug("No translations for locale {locale} for plugin {name}".format(**locals()))
logger.debug("No translations for locale {locale} from plugin {name}".format(**locals()))
# core translations
dirs = additional_folders + [os.path.join(ctx.app.root_path, 'translations')]
for dirname in dirs:
core_translations = support.Translations.load(dirname, [locale])
if isinstance(core_translations, support.Translations):
logger.debug("Using translation folder {dirname} for locale {locale} of core translations".format(**locals()))
logger.debug("Using translation core folder {dirname} for locale {locale}".format(**locals()))
break
else:
logger.debug("No core translations for locale {locale}")
logger.debug("No translations for locale {} in core folders".format(locale))
translations = translations.merge(core_translations)
ctx.babel_translations = translations