Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2016-07-15 12:35:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-07-03 12:22:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2016-07-15 12:35:10.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Jul 6 15:04:07 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.24.0 + * Also search catalogs for stripped variants of values in + env var LANGUAGE + * Fix parsing of env var values WRT modifier and codeset, + done in wrong order + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.24.0.php + +------------------------------------------------------------------- Old: ---- ki18n-5.23.0.tar.xz New: ---- ki18n-5.24.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.Vag422/_old 2016-07-15 12:35:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Vag422/_new 2016-07-15 12:35:11.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5I18n5 -%define _tar_path 5.23 +%define _tar_path 5.24 Name: ki18n -Version: 5.23.0 +Version: 5.24.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ ki18n-5.23.0.tar.xz -> ki18n-5.24.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.23.0/CMakeLists.txt new/ki18n-5.24.0/CMakeLists.txt --- old/ki18n-5.23.0/CMakeLists.txt 2016-06-06 13:35:39.000000000 +0200 +++ new/ki18n-5.24.0/CMakeLists.txt 2016-07-03 11:13:38.000000000 +0200 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.23.0 NO_MODULE) +find_package(ECM 5.24.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -16,7 +16,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.23.0") # handled by release scripts +set(KF5_VERSION "5.24.0") # handled by release scripts ecm_setup_version( ${KF5_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.23.0/metainfo.yaml new/ki18n-5.24.0/metainfo.yaml --- old/ki18n-5.23.0/metainfo.yaml 2016-06-06 13:35:39.000000000 +0200 +++ new/ki18n-5.24.0/metainfo.yaml 2016-07-03 11:13:38.000000000 +0200 @@ -3,7 +3,10 @@ tier: 1 type: functional platforms: - - name: All + - name: Linux + - name: Windows + - name: MacOSX + - name: Android portingAid: false deprecated: false release: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.23.0/po/it/ki18n5.po new/ki18n-5.24.0/po/it/ki18n5.po --- old/ki18n-5.23.0/po/it/ki18n5.po 2016-06-06 13:35:39.000000000 +0200 +++ new/ki18n-5.24.0/po/it/ki18n5.po 2016-07-03 11:13:38.000000000 +0200 @@ -23,7 +23,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" #. i18n: Decide which string is used to delimit keys in a keyboard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.23.0/src/klocalizedstring.cpp new/ki18n-5.24.0/src/klocalizedstring.cpp --- old/ki18n-5.23.0/src/klocalizedstring.cpp 2016-06-06 13:35:39.000000000 +0200 +++ new/ki18n-5.24.0/src/klocalizedstring.cpp 2016-07-03 11:13:38.000000000 +0200 @@ -74,15 +74,16 @@ locale.truncate(f); } - f = locale.indexOf(QLatin1Char('.')); + // now decompose into [language[_territory][.codeset][@modifier]] + f = locale.indexOf(QLatin1Char('@')); if (f >= 0) { - charset = locale.mid(f + 1); + modifier = locale.mid(f + 1); locale.truncate(f); } - f = locale.indexOf(QLatin1Char('@')); + f = locale.indexOf(QLatin1Char('.')); if (f >= 0) { - modifier = locale.mid(f + 1); + charset = locale.mid(f + 1); locale.truncate(f); } @@ -101,6 +102,10 @@ QString language, country, modifier, charset; splitLocale(value, language, country, modifier, charset); + if (language.isEmpty()) { + return; + } + if (!country.isEmpty() && !modifier.isEmpty()) { languages += language + QLatin1Char('_') + country + QLatin1Char('@') @@ -126,7 +131,9 @@ if (!qenvar.isEmpty()) { QString value = QFile::decodeName(qenvar); if (isList) { - languages += value.split(QLatin1Char(':')); + foreach(const QString &v, value.split(QLatin1Char(':'), QString::SkipEmptyParts)) { + appendLocaleString(languages, v); + } } else { appendLocaleString(languages, value); }
