File fallbackLang.diff of Package ki18n

Overview Repositories Revisions Requests Users Attributes Meta

File fallbackLang.diff of Package ki18n (Revision 447aad8838052a8d15c472de78bda95e)

Currently displaying revision 447aad8838052a8d15c472de78bda95e , Show latest

diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
index 8b8feb3..98b393d 100644
--- a/src/kcatalog.cpp
+++ b/src/kcatalog.cpp
@@ -118,9 +118,22 @@ KCatalog::~KCatalog()
 QString KCatalog::catalogLocaleDir(const QByteArray &domain,
                                    const QString &language)
 {
-    QString relpath = QStringLiteral("%1/LC_MESSAGES/%2.mo")
+     QStringList localeDirs;
+     QString localeDir;
+     QString relpath = QStringLiteral("%1/LC_MESSAGES/%2.mo")
                       .arg(language, QFile::decodeName(domain));
 
+    // Specific SUSE kf5 location   ; bundle-lang-bla  ; update-translations ; generic
+    localeDirs << QStringLiteral("/usr/share/locale/kf5/") << QStringLiteral("/usr/share/locale-bundle/kf5/") << QStringLiteral("/usr/share/locale-bundle/") << QStringLiteral("/usr/share/locale-langpack/");
+
+    foreach (const QString &locDir, localeDirs) {
+        QFile file(locDir + relpath);
+        if (file.exists()) {
+            return locDir;
+        }
+    }
+    // Check the standard locations
+
     {
         QMutexLocker lock(&catalogStaticData->mutex);
         const QString customLocaleDir = catalogStaticData->customCatalogDirs.value(domain);
@@ -137,7 +150,6 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
 
     QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
                                           QStringLiteral("locale/") + relpath);
-    QString localeDir;
     if (!file.isEmpty()) {
 #if defined(Q_OS_ANDROID)
         // The exact file name must be returned on Android because libintl-lite loads a catalog by filename with bindtextdomain()
@@ -153,9 +165,23 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
 QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
 {
     QString domain = QFile::decodeName(domain_);
-    QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
-                                 QStringLiteral("locale"),
-                                 QStandardPaths::LocateDirectory);
+
+    QStringList localeDirPaths;
+    QStringList localeDirs;
+
+    // Specific SUSE kf5 location   ; bundle-lang-bla  ; update-translations ; generic
+    localeDirs << QStringLiteral("/usr/share/locale/kf5") << QStringLiteral("/usr/share/locale-bundle/kf5") << QStringLiteral("/usr/share/locale-bundle") << QStringLiteral("/usr/share/locale-langpack");
+
+    foreach (const QString &localeDir, localeDirs) {
+        QDir locDir(localeDir);
+        if (locDir.exists()) {
+            localeDirPaths.append(localeDir);
+        }
+    }
+    QStringList localeFallbackDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+                                  QStringLiteral("locale"),
+                                  QStandardPaths::LocateDirectory);
+    localeDirPaths.append(localeFallbackDirPaths);
 
     {
         QMutexLocker lock(&catalogStaticData->mutex);

Places

File fallbackLang.diff of Package ki18n (Revision 447aad8838052a8d15c472de78bda95e)

Places