File fallbackLang.diff of Package ki18n

Overview Repositories Revisions Requests Users Attributes Meta

File fallbackLang.diff of Package ki18n (Revision 918b2c2f39f35a36d88a7a4185bd235e)

Currently displaying revision 918b2c2f39f35a36d88a7a4185bd235e , Show latest

diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
index 7711e9b..8a1ebde 100644
--- a/src/kcatalog.cpp
+++ b/src/kcatalog.cpp
@@ -113,7 +113,10 @@ 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/kf5/") + relpath);
+    QString fallbackfile = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
                                           QString::fromLatin1("locale/") + relpath);
+    file.append(fallbackfile);
     QString localeDir;
     if (file.isEmpty()) {
         localeDir = QString();
@@ -128,8 +131,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 918b2c2f39f35a36d88a7a4185bd235e)

Places