Merge pull request #11218 from daschuer/gh11195

Fix assuming wrong system language on macOS, fixes #11195
mixxxdj · Jan 26, 2023 · d1f6337 · d1f6337
2 parents 5a3e9b8 + 5dceb8f
commit d1f6337
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/util/translations.h b/src/util/translations.h
@@ -43,6 +43,14 @@ class Translations {
             }
             QLocale::setDefault(customLocale);
         }
+#if defined(__APPLE__) && (QT_VERSION < QT_VERSION_CHECK(6, 2, 0))
+        else {
+            // Workaround https://github.com/mixxxdj/mixxx/issues/11195 and
+            // QTBUG-90971 fixed in Qt 6.2
+            const auto sysLocale = QLocale::system();
+            QLocale::setDefault(QLocale(sysLocale.language(), sysLocale.country()));
+        }
+#endif
 
         // Constructs a QLocale object initialized with the default locale. If
         // no default locale was set using setDefault(), this locale will be