Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2014-10-01 11:22:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ki18n" Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2014-09-12 17:03:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2014-10-01 11:22:34.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Sep 25 16:54:04 UTC 2014 - hrvoje.senjan@gmail.com + +- Added fallbackLang.diff: make translations be seen from a custom + directory (which will be $share_prefix/locale/kf5. Otherwise + every langauge in the KF5 era will need to conflict with kdelibs4 + ones. Needs also adjusting in kf5-filesystem, and dropping of + find_lang in some packages, as that macro doesn't look in + subdirectories. + +------------------------------------------------------------------- New: ---- fallbackLang.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.sowQLz/_old 2014-10-01 11:22:36.000000000 +0200 +++ /var/tmp/diff_new_pack.sowQLz/_new 2014-10-01 11:22:36.000000000 +0200 @@ -36,6 +36,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE fallbackLang.diff -- look for translations in locale/kf5 also +Patch0: fallbackLang.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,6 +78,7 @@ %lang_package -n %lname %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ fallbackLang.diff ++++++ 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); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org