File fallbackLang.diff of Package ki18n

Overview Repositories Revisions Requests Users Attributes Meta

File fallbackLang.diff of Package ki18n (Revision 421f2ea53eb60c6f69183b69a332ece6)

Currently displaying revision 421f2ea53eb60c6f69183b69a332ece6 , Show latest

diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
index 7711e9b..8a4e12e 100644
--- a/src/kcatalog.cpp
+++ b/src/kcatalog.cpp
@@ -113,14 +113,23 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
     QString relpath = QString::fromLatin1("%1/LC_MESSAGES/%2.mo")
                       .arg(language, QFile::decodeName(domain));
     QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-                                          QString::fromLatin1("locale/") + relpath);
+                                          QString::fromLatin1("locale/kf5/") + relpath);
     QString localeDir;
     if (file.isEmpty()) {
-        localeDir = QString();
+        QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+                                             QString::fromLatin1("locale/") + relpath);
+        if (file.isEmpty()) {
+            localeDir = QString();
+        } else {
+            localeDir = QFileInfo(file.left(file.size() - relpath.size())).absolutePath();
+        }
+        // qDebug() << "localeDir= " << localeDir;
+        return localeDir;
     } else {
         // Path of the locale/ directory must be returned.
         localeDir = QFileInfo(file.left(file.size() - relpath.size())).absolutePath();
     }
+    // qDebug() << "localeDir= " << localeDir;
     return localeDir;
 }
 
@@ -128,8 +137,12 @@ QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
 {
     QString domain = QFile::decodeName(domain_);
     QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+                                 QString::fromLatin1("locale/kf5"),
+                                 QStandardPaths::LocateDirectory);
+    QStringList localeFallbackDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
                                  QString::fromLatin1("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 421f2ea53eb60c6f69183b69a332ece6)

Places