Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / application.cpp

diff --git a/pv/application.cpp b/pv/application.cpp
index 15195d067da801e594ce573ccf756a79200d4986..cce6393c39054fb4a961fdc1bd789863e9495d69 100644 (file)
--- a/pv/application.cpp
+++ b/pv/application.cpp
@@ -86,7 +86,9 @@ const QStringList Application::get_languages() const
 const QString Application::get_language_editors(const QString& language) const
 {
        if (language == "de") return "Sören Apel, Uwe Hermann";
-       if (language == "es_mx") return "Carlos Diaz";
+       if (language == "es_MX") return "Carlos Diaz, Ulices Avila Hernandez";
+       if (language == "ja_jp") return "Yukari Shoji";
+       if (language == "zh_cn") return "ZtyPro";
 
        return QString();
 }
@@ -106,7 +108,11 @@ void Application::switch_language(const QString& language)
                        qWarning() << "Translation resource" << resource << "not found";
 
                // Qt translations
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+               QString tr_path(QLibraryInfo::path(QLibraryInfo::TranslationsPath));
+#else
                QString tr_path(QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+#endif
 
                if (qt_translator_.load("qt_" + language, tr_path))
                        installTranslator(&qt_translator_);