Mercurial > hg > octave-shane

changeset 16863:c82b3614eace

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Torsten <ttl@justmail.de>
date Fri, 28 Jun 2013 22:17:26 +0200
parents d17ce4f00917
children 06657ee17aa2
files libgui/src/resource-manager.cc
diffstat 1 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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 ());
 }