Merge branch 'staging' into wgem

# Conflicts:
#	CHANGELOG.md
#	bauh/__init__.py
This commit is contained in:
Vinícius Moreira
2019-12-20 10:37:50 -03:00
2 changed files with 5 additions and 1 deletions

View File

@@ -55,7 +55,7 @@ def get_locale_keys(key: str = None, locale_dir: str = resource.get_path('locale
break
if not locale_path:
return key, {}
return current_locale if current_locale else key, {}
with open(locale_path, 'r') as f:
locale_keys = f.readlines()