# HG changeset patch # User Torsten # Date 1372450646 -7200 # Node ID c82b3614eacea4775865c8e82c4dd2353c0e4fc4 # Parent d17ce4f009170717a01a25b3d43c98ff074092ef try harder to load the qt translation files at start up * resource-manager.cc(config_translators): try to load the translations files with lower case name, too diff --git a/libgui/src/resource-manager.cc b/libgui/src/resource-manager.cc --- a/libgui/src/resource-manager.cc +++ b/libgui/src/resource-manager.cc @@ -87,18 +87,27 @@ QTranslator *qsci_tr, QTranslator *gui_tr) { + bool loaded; + + QString qt_trans_dir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); QSettings *settings = resource_manager::get_settings (); // FIXME -- what should happen if settings is 0? + // get the locale from the settings QString language = settings->value ("language","SYSTEM").toString (); if (language == "SYSTEM") language = QLocale::system().name(); // get system wide locale + // load the translator file for qt strings - qt_tr->load("qt_" + language, - QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + loaded = qt_tr->load("qt_" + language, qt_trans_dir); + if (!loaded) // try lower case + qt_tr->load("qt_" + language.toLower (), qt_trans_dir); + // load the translator file for qscintilla settings - qsci_tr->load("qscintilla_" + language, - QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + loaded = qsci_tr->load("qscintilla_" + language, qt_trans_dir); + if (!loaded) // try lower case + qsci_tr->load("qscintilla_" + language.toLower (), qt_trans_dir); + // load the translator file for gui strings gui_tr->load (language, get_gui_translation_dir ()); }