diff --git a/openlp.pyw b/openlp.pyw index 8505f002d..bc3cd895e 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -240,10 +240,14 @@ def main(): + "/qt4_plugins") # i18n Set Language language = LanguageManager.get_language() - appTranslator, default_string_translator = \ + app_translator, default_translator = \ LanguageManager.get_translator(language) - app.installTranslator(appTranslator) - app.installTranslator(default_string_translator) + if not app_translator.isEmpty(): + app.installTranslator(app_translator) + if not default_translator.isEmpty(): + app.installTranslator(default_translator) + else: + log.debug(u'Could not find default_translator.') if not options.no_error_form: sys.excepthook = app.hookException sys.exit(app.run()) @@ -253,3 +257,4 @@ if __name__ == u'__main__': Instantiate and run the application. """ main() + diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py index e47f3fbde..190f8af02 100644 --- a/openlp/core/utils/languagemanager.py +++ b/openlp/core/utils/languagemanager.py @@ -55,11 +55,11 @@ class LanguageManager(object): language = QtCore.QLocale.system().name() lang_path = AppLocation.get_directory(AppLocation.LanguageDir) app_translator = QtCore.QTranslator() - if not app_translator.load(language, lang_path): - return + app_translator.load(language, lang_path) + # A translator for buttons and other default strings provided by Qt. default_string_translator = QtCore.QTranslator() - if default_string_translator.load(u'qt_%s' % language, lang_path): - return app_translator, default_string_translator + default_string_translator.load(u'qt_%s' % language, lang_path) + return app_translator, default_string_translator @staticmethod def find_qm_files():