language manager

This commit is contained in:
Tim Bentley 2016-03-31 17:42:42 +01:00
parent ba6d66497c
commit 4362ff63f8
3 changed files with 3 additions and 6 deletions

View File

@ -243,3 +243,4 @@ from .settings import Settings
from .applocation import AppLocation from .applocation import AppLocation
from .historycombobox import HistoryComboBox from .historycombobox import HistoryComboBox
from .actions import ActionList from .actions import ActionList
from .languagemanager import LanguageManager

View File

@ -510,7 +510,7 @@ def get_locale_key(string):
try: try:
if ICU_COLLATOR is None: if ICU_COLLATOR is None:
import icu import icu
from .languagemanager import LanguageManager from openlp.core.common.languagemanager import LanguageManager
language = LanguageManager.get_language() language = LanguageManager.get_language()
icu_locale = icu.Locale(language) icu_locale = icu.Locale(language)
ICU_COLLATOR = icu.Collator.createInstance(icu_locale) ICU_COLLATOR = icu.Collator.createInstance(icu_locale)
@ -534,10 +534,6 @@ def get_natural_key(string):
return [b''] + key return [b''] + key
return key return key
__all__ = ['get_application_version', 'check_latest_version',
from .languagemanager import LanguageManager
__all__ = ['LanguageManager', 'get_application_version', 'check_latest_version',
'add_actions', 'get_filesystem_encoding', 'get_web_page', 'get_uno_command', 'get_uno_instance', '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'] 'delete_file', 'clean_filename', 'format_time', 'get_locale_key', 'get_natural_key']