File fallbackLang.diff of Package ki18n

Overview Repositories Revisions Requests Users Attributes Meta

File fallbackLang.diff of Package ki18n (Revision 3858e9e0de1373f85793dbbccea17dd6)

Currently displaying revision 3858e9e0de1373f85793dbbccea17dd6 , Show latest

diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
index a85b6bb..f606c9e 100644
--- a/src/kcatalog.cpp
+++ b/src/kcatalog.cpp
@@ -110,26 +110,51 @@ KCatalog::~KCatalog()
 QString KCatalog::catalogLocaleDir(const QByteArray &domain,
                                    const QString &language)
 {
+    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
     QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-                                          QStringLiteral("locale/") + relpath);
-    QString localeDir;
-    if (file.isEmpty()) {
-        localeDir = QString();
-    } else {
-        // Path of the locale/ directory must be returned.
+                                             QStringLiteral("locale/") + relpath);
+    if (!file.isEmpty()) {
         localeDir = QFileInfo(file.left(file.size() - relpath.size())).absolutePath();
+        return localeDir;
     }
+    // No translation around
+    localeDir = QString();
     return localeDir;
 }
 
 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);
     QSet<QString> availableLanguages;
     foreach (const QString &localDirPath, localeDirPaths) {
         QDir localeDir(localDirPath);

Places

File fallbackLang.diff of Package ki18n (Revision 3858e9e0de1373f85793dbbccea17dd6)

Places