From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Mon, 4 Nov 2024 07:17:20 +0000 (+0900)
Subject: Remove unneeded workaround for dash separated language strings
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~5^2~8^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=884f800abc65f9227bbe31decbad57a8fbdaf86f;p=nextcloud-desktop.git

Remove unneeded workaround for dash separated language strings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index ebcaa25fc..3510bbb86 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -967,10 +967,8 @@ QString substLang(const QString &lang)
 
 void Application::setupTranslations()
 {
-    QStringList uiLanguages;
-    uiLanguages = QLocale::system().uiLanguages();
-
-    QString enforcedLocale = Theme::instance()->enforcedLocale();
+    auto uiLanguages = QLocale::system().uiLanguages(QLocale::TagSeparator::Underscore);
+    const auto enforcedLocale = Theme::instance()->enforcedLocale();
     if (!enforcedLocale.isEmpty()) {
         uiLanguages.prepend(enforcedLocale);
     }
@@ -979,8 +977,7 @@ void Application::setupTranslations()
     auto *qtTranslator = new QTranslator(this);
     auto *qtkeychainTranslator = new QTranslator(this);
 
-    for (QString lang : qAsConst(uiLanguages)) {
-        lang.replace(QLatin1Char('-'), QLatin1Char('_')); // work around QTBUG-25973
+    for (auto &lang : qAsConst(uiLanguages)) {
         lang = substLang(lang);
         const auto trPath = applicationTrPath();
         const auto trFolder = QDir{trPath};