X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fapplication.cpp;h=3e4691d0776434398467cd0cd0b3230bc37317ec;hb=d803699593f0b2df304aeba70a57485eb9ffd9b6;hp=e933f96214d94c72620a088f7e766e8a675b574b;hpb=0466001be51e779b23aaebec1cc9361305c07be9;p=pulseview.git

diff --git a/pv/application.cpp b/pv/application.cpp
index e933f962..3e4691d0 100644
--- a/pv/application.cpp
+++ b/pv/application.cpp
@@ -21,6 +21,10 @@
 #include <typeinfo>
 
 #include <QDebug>
+#include <QDir>
+#include <QLibraryInfo>
+#include <QMessageBox>
+#include <QWidget>
 
 #include <boost/version.hpp>
 
@@ -61,10 +65,27 @@ Application::Application(int &argc, char* argv[]) :
 	setOrganizationDomain("sigrok.org");
 }
 
+QStringList Application::get_languages()
+{
+	QStringList files = QDir(":/l10n/").entryList(QStringList("*.qm"), QDir::Files);
+
+	QStringList result;
+	result << "en";  // Add default language to the set
+
+	// Remove file extensions
+	for (QString file : files)
+		result << file.split(".").front();
+
+	result.sort(Qt::CaseInsensitive);
+
+	return result;
+}
+
 void Application::switch_language(const QString& language)
 {
 	removeTranslator(&app_translator_);
 	removeTranslator(&qt_translator_);
+	removeTranslator(&qtbase_translator_);
 
 	if ((language != "C") && (language != "en")) {
 		// Application translations
@@ -75,11 +96,34 @@ 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()) {
+		// Force all windows to update
+		for (QWidget *widget : topLevelWidgets())
+			widget->update();
+
+		QMessageBox msg(topLevelWidgets().front());
+		msg.setText(tr("Some parts of the application may still " \
+				"use the previous language. Re-opening the affected windows or " \
+				"restarting the application will remedy this."));
+		msg.setStandardButtons(QMessageBox::Ok);
+		msg.setIcon(QMessageBox::Information);
+		msg.exec();
 	}
 }