X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fapplication.cpp;h=6f666c5c308762c55ea0990297f1ea9fea1536eb;hp=67e0444f435b53fa8c67ae3f51a6058db0ba7e37;hb=49fee853b3f56ba78810260c71c3c402067f09fe;hpb=380f4ee6f9e2995084afd395698b7eafc7012942

diff --git a/pv/application.cpp b/pv/application.cpp
index 67e0444f..6f666c5c 100644
--- a/pv/application.cpp
+++ b/pv/application.cpp
@@ -22,6 +22,7 @@
 
 #include <QDebug>
 #include <QDir>
+#include <QLibraryInfo>
 #include <QMessageBox>
 #include <QWidget>
 
@@ -72,7 +73,7 @@ QStringList Application::get_languages()
 	result << "en";  // Add default language to the set
 
 	// Remove file extensions
-	for (QString file : files)
+	for (const QString& file : files)
 		result << file.split(".").front();
 
 	result.sort(Qt::CaseInsensitive);
@@ -84,6 +85,7 @@ void Application::switch_language(const QString& language)
 {
 	removeTranslator(&app_translator_);
 	removeTranslator(&qt_translator_);
+	removeTranslator(&qtbase_translator_);
 
 	if ((language != "C") && (language != "en")) {
 		// Application translations
@@ -94,11 +96,20 @@ void Application::switch_language(const QString& language)
 			qWarning() << "Translation resource" << resource << "not found";
 
 		// Qt translations
-		resource = ":/l10n/qtbase_" + language +".qm";
-		if (qt_translator_.load(resource))
+		QString tr_path(QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+
+		if (qt_translator_.load("qt_" + language, tr_path))
 			installTranslator(&qt_translator_);
 		else
-			qWarning() << "Translation resource" << resource << "not found";
+			qWarning() << "QT translations for" << language << "not found at" <<
+				tr_path << ", Qt translations package is probably missing";
+
+		// Qt base translations
+		if (qtbase_translator_.load("qtbase_" + language, tr_path))
+			installTranslator(&qtbase_translator_);
+		else
+			qWarning() << "QT base translations for" << language << "not found at" <<
+				tr_path << ", Qt translations package is probably missing";
 	}
 
 	if (!topLevelWidgets().empty()) {