Changeset 2998 for vidalia/trunk

Timestamp:

08/20/08 01:27:11 (3 months ago)

Author:

edmanm

Message:

Try to load a translation for the current language from Qt's translations
directory, so we can get Qt's internal widgets (e.g. QDialogButtonBox)
translated.

Files:

• vidalia/trunk/src/vidalia/languagesupport.cpp (modified) (2 diffs)

vidalia/trunk/src/vidalia/languagesupport.cpp

@@ -17 +17 @@
 #include <QTranslator>
 #include <QLocale>
+#include <QLibraryInfo>
 #include <vidalia.h>
 
@@ -139 +140 @@
     return true;
 
-  QTranslator *translator = new QTranslator(vApp);
-  if (translator->load(QString(":/lang/vidalia_%1.qm").arg(languageCode))) {
-    QApplication::installTranslator(translator);
-    if (isRightToLeft(languageCode))
-      vApp->setLayoutDirection(Qt::RightToLeft);
+  /* Attempt to load the translations for Qt's internal widgets from their
+   * installed Qt directory. */
+  QTranslator *systemQtTranslator = new QTranslator(vApp);
+  Q_CHECK_PTR(systemQtTranslator);
+
+  QString qtDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+  if (systemQtTranslator->load(qtDir + "/qt_" + languageCode + ".qm"))
+    QApplication::installTranslator(systemQtTranslator);
+  else
+    delete systemQtTranslator;
+
+  /* Install a translator for Vidalia's UI widgets */
+  QTranslator *vidaliaTranslator = new QTranslator(vApp);
+  Q_CHECK_PTR(vidaliaTranslator);
+
+  if (vidaliaTranslator->load(":/lang/vidalia_" + languageCode + ".qm")) {
+    QApplication::installTranslator(vidaliaTranslator);
     return true;
   }
-  delete translator;
+  delete vidaliaTranslator;
   return false;
 }
-