From 4362ff63f89b1ccdce3ce2b11736ee3fc9d5304c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 31 Mar 2016 17:42:42 +0100 Subject: [PATCH] language manager --- openlp/core/common/__init__.py | 1 + openlp/core/{utils => common}/languagemanager.py | 0 openlp/core/utils/__init__.py | 8 ++------ 3 files changed, 3 insertions(+), 6 deletions(-) rename openlp/core/{utils => common}/languagemanager.py (100%) diff --git a/openlp/core/common/__init__.py b/openlp/core/common/__init__.py index 33a1129c5..fcb96e5ac 100644 --- a/openlp/core/common/__init__.py +++ b/openlp/core/common/__init__.py @@ -243,3 +243,4 @@ from .settings import Settings from .applocation import AppLocation from .historycombobox import HistoryComboBox from .actions import ActionList +from .languagemanager import LanguageManager diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/common/languagemanager.py similarity index 100% rename from openlp/core/utils/languagemanager.py rename to openlp/core/common/languagemanager.py diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index a8c65eb2a..6829383de 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -510,7 +510,7 @@ def get_locale_key(string): try: if ICU_COLLATOR is None: import icu - from .languagemanager import LanguageManager + from openlp.core.common.languagemanager import LanguageManager language = LanguageManager.get_language() icu_locale = icu.Locale(language) ICU_COLLATOR = icu.Collator.createInstance(icu_locale) @@ -534,10 +534,6 @@ def get_natural_key(string): return [b''] + key return key - -from .languagemanager import LanguageManager - - -__all__ = ['LanguageManager', 'get_application_version', 'check_latest_version', +__all__ = ['get_application_version', 'check_latest_version', 'add_actions', 'get_filesystem_encoding', 'get_web_page', 'get_uno_command', 'get_uno_instance', 'delete_file', 'clean_filename', 'format_time', 'get_locale_key', 'get_natural_key']