From 9fcfb8e3ba76abe7d5553f7e702bf727e9353bab Mon Sep 17 00:00:00 2001
From: Martin Brodbeck <martin@brodbeck-online.de>
Date: Mon, 26 Sep 2022 20:47:23 +0200
Subject: [PATCH] Loading translation improved.

---
 src/gui/kima2.cpp | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/gui/kima2.cpp b/src/gui/kima2.cpp
index bd5b470..b5ecc97 100644
--- a/src/gui/kima2.cpp
+++ b/src/gui/kima2.cpp
@@ -21,21 +21,12 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain("rustysoft.de");
     QCoreApplication::setApplicationName("kima2");
 
-    QTranslator qTranslator;
-    QLocale german(QLocale::German);
-#ifdef __linux__
-    bool retVal =
-        qTranslator.load("qt_" + german.name(), QLibraryInfo::path(QLibraryInfo::TranslationsPath));
-    if (!retVal) {
-        throw std::runtime_error("Could not load translation.");
+    QTranslator qtTranslator;
+
+    if (qtTranslator.load(QLocale::system(), u"qtbase"_qs, u"_"_qs,
+                         QLibraryInfo::path(QLibraryInfo::TranslationsPath))) {
+        kimaApp.installTranslator(&qtTranslator);
     }
-#endif
-#ifdef _WIN32
-    QApplication::setStyle(QStyleFactory::create("Fusion"));
-    qTranslator.load("qt_" + german.name(),
-                     QApplication::applicationDirPath() + QDir::separator() + "translations");
-#endif
-    kimaApp.installTranslator(&qTranslator);
 
     QSettings settings{};
     while (!settings.contains("global/cashPointNo")) {