Commit 904cc82d authored by Boudewijn Rempt's avatar Boudewijn Rempt Committed by Wolthera van Hövell

Also revert the patch

parent 349b5e77
diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
index 6682d62..d975c57 100644 index 7711e9b..b6280ed 100644
--- a/src/kcatalog.cpp --- a/src/kcatalog.cpp
+++ b/src/kcatalog.cpp +++ b/src/kcatalog.cpp
@@ -118,7 +118,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, @@ -112,7 +112,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
{ {
QString relpath = QStringLiteral("%1/LC_MESSAGES/%2.mo") QString relpath = QString::fromLatin1("%1/LC_MESSAGES/%2.mo")
.arg(language, QFile::decodeName(domain)); .arg(language, QFile::decodeName(domain));
- QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+ QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, + QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation,
QStringLiteral("locale/") + relpath); QString::fromLatin1("locale/") + relpath);
QString localeDir; QString localeDir;
if (file.isEmpty()) { if (file.isEmpty()) {
@@ -133,7 +133,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, @@ -127,7 +127,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_) QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
{ {
QString domain = QFile::decodeName(domain_); QString domain = QFile::decodeName(domain_);
- QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, - QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+ QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, + QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::AppDataLocation,
QStringLiteral("locale"), QString::fromLatin1("locale"),
QStandardPaths::LocateDirectory); QStandardPaths::LocateDirectory);
QSet<QString> availableLanguages; QSet<QString> availableLanguages;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment