3rdparty/ext_frameworks/ki18n-appdatalocation.diff

0001 diff --git a/docs/programmers-guide.md b/docs/programmers-guide.md
0002 index 9505366..65fc9a5 100644
0003 --- a/docs/programmers-guide.md
0004 +++ b/docs/programmers-guide.md
0005 @@ -2246,7 +2246,7 @@ then a call to
0006
0007  ~~~
0008  QString splashPath = QStandardPaths::locate(
0009 -    QStandardPaths::GenericDataLocation, "splash.png");
0010 +    QStandardPaths::AppDataLocation, "splash.png");
0011  splashPath = KLocalizedString::localizedFilePath(splashPath);
0012  ~~~
0013
0014 diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
0015 index c47ffac..e24eb84 100644
0016 --- a/src/kcatalog.cpp
0017 +++ b/src/kcatalog.cpp
0018 @@ -144,7 +144,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
0019      }
0020      return file;
0021  #else
0022 -    const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("locale/") + relpath);
0023 +    const QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("locale/") + relpath);
0024
0025      QString localeDir;
0026      if (!file.isEmpty()) {
0027 @@ -158,7 +158,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
0028  QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
0029  {
0030      QString domain = QFile::decodeName(domain_);
0031 -    QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
0032 +    QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::AppDataLocation,
0033                                   QStringLiteral("locale"),
0034                                   QStandardPaths::LocateDirectory);
0035
0036 diff --git a/src/klocalizedstring.cpp b/src/klocalizedstring.cpp
0037 index eb42c81..219bb51 100644
0038 --- a/src/klocalizedstring.cpp
0039 +++ b/src/klocalizedstring.cpp
0040 @@ -1363,7 +1363,7 @@ void KLocalizedStringPrivate::locateScriptingModule(const QByteArray &domain,
0041
0042      // Try to find this module.
0043      QString modapath = QStandardPaths::locate(
0044 -                           QStandardPaths::GenericDataLocation,
0045 +                           QStandardPaths::AppDataLocation,
0046                             QLatin1String("locale") + QLatin1Char('/') + modrpath);
0047
0048      // If the module exists and hasn't been already included.