Improve language detection

Fixes #768
FedoraQt · Nov 25, 2024 · 6508e5d · 6508e5d
1 parent 2f8bf4c
commit 6508e5d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -51,8 +51,11 @@ int main(int argc, char **argv)
     mDebug() << "Application constructed";
 
     QTranslator translator;
-    if (translator.load(QLocale(QLocale::system().language()), QLatin1String(), QLatin1String(), ":/translations"))
+    QLocale locale(QLocale::system().language(), QLocale::system().script(), QLocale::system().territory());
+    if (translator.load(locale, QLatin1String(), QLatin1String(), ":/translations")) {
+        mDebug() << "Localization " << locale;
         app.installTranslator(&translator);
+    }
 
     QGuiApplication::setDesktopFileName("org.fedoraproject.MediaWriter.desktop");
 

diff --git a/src/helper/linux/main.cpp b/src/helper/linux/main.cpp
@@ -30,8 +30,9 @@ int main(int argc, char *argv[])
     QCoreApplication app(argc, argv);
 
     QTranslator translator;
-    if (translator.load(QLocale(), QLatin1String(), QLatin1String(), QLatin1String(":/translations")))
+    if (translator.load(QLocale(QLocale::system().language(), QLocale::system().script(), QLocale::system().territory()), QLatin1String(), QLatin1String(), ":/translations")) {
         app.installTranslator(&translator);
+    }
 
     if (app.arguments().count() == 3 && app.arguments()[1] == "restore") {
         new RestoreJob(app.arguments()[2]);

diff --git a/src/helper/mac/main.cpp b/src/helper/mac/main.cpp
@@ -30,8 +30,9 @@ int main(int argc, char *argv[])
     QCoreApplication app(argc, argv);
 
     QTranslator translator;
-    if (translator.load(QLocale(QLocale().language(), QLocale().country()), QLatin1String(), QLatin1String(), ":/translations"))
+    if (translator.load(QLocale(QLocale::system().language(), QLocale::system().script(), QLocale::system().territory()), QLatin1String(), QLatin1String(), ":/translations")) {
         app.installTranslator(&translator);
+    }
 
     if (app.arguments().count() == 3 && app.arguments()[1] == "restore") {
         new RestoreJob(app.arguments()[2]);

diff --git a/src/helper/win/main.cpp b/src/helper/win/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
     QCoreApplication app(argc, argv);
 
     QTranslator translator;
-    if (translator.load(QLocale(), QLatin1String(), QLatin1String(), ":/translations")) {
+    if (translator.load(QLocale(QLocale::system().language(), QLocale::system().script(), QLocale::system().territory()), QLatin1String(), QLatin1String(), ":/translations")) {
         app.installTranslator(&translator);
     }