Changeset 14396 for trunk/qt/app.cc

Timestamp:

Dec 22, 2014, 1:08:19 AM (8 years ago)

Author:

mikedld

Message:

#4050: Use TRANSLATIONS_DIR macro as a hint for Qt client translation files location

File:

• trunk/qt/app.cc (modified) (2 diffs)

trunk/qt/app.cc

@@ -81 +81 @@
     MODEL_REFRESH_INTERVAL_MSEC   = 3000
   };
+
+  bool
+  loadTranslation (QTranslator& translator, const QString& name, const QString& localeName,
+                   const QStringList& searchDirectories)
+  {
+    const QString filename = name + QLatin1Char ('_') + localeName;
+    foreach (const QString& directory, searchDirectories)
+    {
+      if (translator.load (filename, directory))
+        return true;
+    }
+
+    return false;
+  }
 }
 
@@ -96 +110 @@
   setApplicationName (MY_CONFIG_NAME);
 
+  const QString localeName = QLocale ().name ();
+
   // install the qt translator
-  qtTranslator.load ("qt_" + QLocale::system ().name (), QLibraryInfo::location (QLibraryInfo::TranslationsPath));
-  installTranslator (&qtTranslator);
+  if (loadTranslation (qtTranslator, QLatin1String ("qt"), localeName, QStringList ()
+        << QLibraryInfo::location (QLibraryInfo::TranslationsPath)
+#ifdef TRANSLATIONS_DIR
+        << TRANSLATIONS_DIR
+#endif
+        << (applicationDirPath () + "/translations")
+      ))
+    installTranslator (&qtTranslator);
 
   // install the transmission translator
-  appTranslator.load (QString (MY_CONFIG_NAME) + "_" + QLocale::system ().name (), QCoreApplication::applicationDirPath () + "/translations");
-  installTranslator (&appTranslator);
+  if (loadTranslation (appTranslator, MY_CONFIG_NAME, localeName, QStringList ()
+#ifdef TRANSLATIONS_DIR
+        << TRANSLATIONS_DIR
+#endif
+        << (applicationDirPath () + "/translations")
+      ))
+    installTranslator (&appTranslator);
 
   Formatter::initUnits ();