Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2016-04-12 19:18:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-16 10:29:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2016-04-12 19:18:12.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 4 14:20:33 UTC 2016 - [email protected] + +- Update to 5.21.0 (boo#974793) + * Use qt system locale langs as fallback on non UNIX + * Upgrade Qt version requirement to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.21.0.php + +------------------------------------------------------------------- Old: ---- ki18n-5.20.0.tar.xz New: ---- ki18n-5.21.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.HlmN26/_old 2016-04-12 19:18:13.000000000 +0200 +++ /var/tmp/diff_new_pack.HlmN26/_new 2016-04-12 19:18:13.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5I18n5 -%define _tar_path 5.20 +%define _tar_path 5.21 Name: ki18n -Version: 5.20.0 +Version: 5.21.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -28,11 +28,11 @@ BuildRequires: gettext-runtime BuildRequires: kf5-filesystem BuildRequires: python -BuildRequires: cmake(Qt5Concurrent) >= 5.3.0 -BuildRequires: cmake(Qt5Core) >= 5.3.0 -BuildRequires: cmake(Qt5Qml) >= 5.3.0 -BuildRequires: cmake(Qt5Script) >= 5.3.0 -BuildRequires: cmake(Qt5Test) >= 5.3.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.4.0 +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5Qml) >= 5.4.0 +BuildRequires: cmake(Qt5Script) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1+ Group: System/GUI/KDE ++++++ ki18n-5.20.0.tar.xz -> ki18n-5.21.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.20.0/CMakeLists.txt new/ki18n-5.21.0/CMakeLists.txt --- old/ki18n-5.20.0/CMakeLists.txt 2016-03-05 19:57:43.000000000 +0100 +++ new/ki18n-5.21.0/CMakeLists.txt 2016-04-03 22:53:40.000000000 +0200 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.20.0 NO_MODULE) +find_package(ECM 5.21.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.20.0") # handled by release scripts +set(KF5_VERSION "5.21.0") # handled by release scripts ecm_setup_version( ${KF5_VERSION} @@ -26,7 +26,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION "5.3.0") +set(REQUIRED_QT_VERSION 5.4.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.20.0/po/ca/scripts/ki18n5/ki18n5.js new/ki18n-5.21.0/po/ca/scripts/ki18n5/ki18n5.js --- old/ki18n-5.20.0/po/ca/scripts/ki18n5/ki18n5.js 1970-01-01 01:00:00.000000000 +0100 +++ new/ki18n-5.21.0/po/ca/scripts/ki18n5/ki18n5.js 2016-04-03 22:53:40.000000000 +0200 @@ -0,0 +1,39 @@ +// Set properties of the phrase given by the finalized msgstr in the PO file. +// The arguments to the call are consecutive pairs of keys and values, +// as many as needed (i.e. total number of arguments must be even). +// +// The property keys are registered as PO calls taking single argument, +// which can be used to retrive the property values for this msgstr +// when it is later used as placeholder replacement in another message. +// +// Always signals fallback. +// +function setMsgstrProps (/*KEY1, VALUE1, ...*/) +{ + if (arguments.length % 2 != 0) + throw Error("Property setter given odd number of arguments."); + + // Collect finalized msgstr. + phrase = Ts.msgstrf() + + // Go through all key-value pairs. + for (var i = 0; i < arguments.length; i += 2) { + var pkey = arguments[i]; + var pval = arguments[i + 1]; + + // Set the value of the property for this phrase. + Ts.setProp(phrase, pkey, pval); + + // Set the PO call for getting this property, if not already set. + if (!Ts.hascall(pkey)) { + Ts.setcall(pkey, + function (phr) { return Ts.getProp(phr, this.pkey) }, + {"pkey" : pkey}); + } + } + + throw Ts.fallback(); +} +Ts.setcall("propietats", setMsgstrProps); +// NOTE: You can replace "properties" in the line above with any UTF-8 string, +// e.g. one in your language so that it blends nicely inside POs. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.20.0/po/ca@valencia/scripts/ki18n5/ki18n5.js new/ki18n-5.21.0/po/ca@valencia/scripts/ki18n5/ki18n5.js --- old/ki18n-5.20.0/po/ca@valencia/scripts/ki18n5/ki18n5.js 1970-01-01 01:00:00.000000000 +0100 +++ new/ki18n-5.21.0/po/ca@valencia/scripts/ki18n5/ki18n5.js 2016-04-03 22:53:40.000000000 +0200 @@ -0,0 +1,39 @@ +// Set properties of the phrase given by the finalized msgstr in the PO file. +// The arguments to the call are consecutive pairs of keys and values, +// as many as needed (i.e. total number of arguments must be even). +// +// The property keys are registered as PO calls taking single argument, +// which can be used to retrive the property values for this msgstr +// when it is later used as placeholder replacement in another message. +// +// Always signals fallback. +// +function setMsgstrProps (/*KEY1, VALUE1, ...*/) +{ + if (arguments.length % 2 != 0) + throw Error("Property setter given odd number of arguments."); + + // Collect finalized msgstr. + phrase = Ts.msgstrf() + + // Go through all key-value pairs. + for (var i = 0; i < arguments.length; i += 2) { + var pkey = arguments[i]; + var pval = arguments[i + 1]; + + // Set the value of the property for this phrase. + Ts.setProp(phrase, pkey, pval); + + // Set the PO call for getting this property, if not already set. + if (!Ts.hascall(pkey)) { + Ts.setcall(pkey, + function (phr) { return Ts.getProp(phr, this.pkey) }, + {"pkey" : pkey}); + } + } + + throw Ts.fallback(); +} +Ts.setcall("propietats", setMsgstrProps); +// NOTE: You can replace "properties" in the line above with any UTF-8 string, +// e.g. one in your language so that it blends nicely inside POs. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.20.0/po/fi/scripts/ki18n5/general.pmap new/ki18n-5.21.0/po/fi/scripts/ki18n5/general.pmap --- old/ki18n-5.20.0/po/fi/scripts/ki18n5/general.pmap 2016-03-05 19:57:43.000000000 +0100 +++ new/ki18n-5.21.0/po/fi/scripts/ki18n5/general.pmap 2016-04-03 22:53:40.000000000 +0200 @@ -157,6 +157,7 @@ =:Gypsy:Mustalainen:gen=Mustalaisen:: =/Hakuikkuna/Search Box/elat=Hakuikkunasta/gen=Hakuikkunan// =:Hard Disk I/O Monitor:Kiintolevyjen käyttöilmaisin:gen=Kiintolevyjen käyttöilmaisimen:yleisnimi=kyllä:: +=:Help Center:Ohjekeskus:gen=Ohjekeskuksen:elat=Ohjekeskuksesta:yleisnimi=kyllä:: =:Homerun:elat=Homerunista:gen=Homerunin:: =:Homerun Kicker:elat=Homerun Kickerista:gen=Homerun Kickerin:: =:Homerun Launcher:Homerun-käynnistin:gen=Homerun-käynnistimen:: @@ -181,6 +182,7 @@ =/Image Backend/Kuvataustaosa/elat=Kuvataustaosasta// =:India:Intia:elat=Intiasta:gen=Intian:illat=Intiaan:iness=Intiassa:part=Intiaa:: =:Indonesia:elat=Indonesiasta:gen=Indonesian:illat=Indonesiaan:iness=Indonesiassa:part=Indonesiaa:: +=/Info Center/Infokeskus/elat=Infokeskuksesta/gen=Infokeskuksen// =:Input Method Panel:Syötemenetelmäpaneeli:elat=Syötemenetelmäpaneelista:gen=Syötemenetelmäpaneelin:yleisnimi=kyllä:: =/Internet Book List/hakumuoto=Internet Book Listista// =/Internet Movie Database/hakumuoto=Internet Movie Databasesta// @@ -232,8 +234,9 @@ =/KDE Clock Control Module/KDE:n kelloasetukset/elat=KDE:n kelloasetuksista// =/KDE Desktop Theme Module/KDE:n työpöytäteeman asetukset/elat=KDE:n työpöytäteeman asetuksista// =/KDE Forums/KDE:n foorumit/hakumuoto=KDE:n foorumeilta// +=/KDE Fundamentals/KDE:n perusasiat/hakumuoto=KDE:n foorumeilta// =/KDE Hotkeys Configuration Module/KDE Hotkeys-asetusosio/elat=KDE Hotkeys-asetusosiosta// -=/KDE Info Center/KDE:n infokeskus/elat=KDE:n tietokeskuksesta/gen=KDE:n tietokeskuksen// +=/KDE Info Center/KDE:n infokeskus/elat=KDE:n infokeskuksesta/gen=KDE:n infokeskuksen// =/KDE Joystick Control Module/Peliohjainten hallinta/elat=Peliohjainten hallinnasta// =/KDE Keyboard Control Module/KDE:n näppäimistöasetukset/elat=KDE:n näppäimistöasetuksista/gen=KDE:n näppäimistöasetusten// =/KDE Look/hakumuoto=KDE Lookista// @@ -370,6 +373,7 @@ =:Magnifique:Suurennuslasi:elat=Suurennuslasista:gen=Suurennuslasin:yleisnimi=kyllä:: =/Marble Virtual Globe/Marble-maapallo/elat=Marble-maapallosta/gen=Marble-maapallon// =/Massif Visualizer/Massif-visualisointi/elat=Massif-visualisoinnista/gen=Massif-visualisoinnin// +=:Media frame:Mediakehys:gen=Mediakehyksen:yleisnimi=kyllä:: =:Media Player:Mediasoitin:elat=Mediasoittimesta:gen=Mediasoittimen:yleisnimi=kyllä:: =:Meksiko:Mexico:elat=Meksikosta:gen=Meksikon:illat=Meksikoon:iness=Meksikossa:part=Meksikoa:: =/Meritaistelu/Naval Battle/elat=Meritaistelusta/gen=Meritaistelun// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.20.0/src/klocalizedstring.cpp new/ki18n-5.21.0/src/klocalizedstring.cpp --- old/ki18n-5.20.0/src/klocalizedstring.cpp 2016-03-05 19:57:43.000000000 +0100 +++ new/ki18n-5.21.0/src/klocalizedstring.cpp 2016-04-03 22:53:40.000000000 +0200 @@ -95,6 +95,30 @@ language = locale; } +static void appendLocaleString(QStringList &languages, const QString &value) +{ + // Process the value to create possible combinations. + QString language, country, modifier, charset; + splitLocale(value, language, country, modifier, charset); + + if (!country.isEmpty() && !modifier.isEmpty()) { + languages += language + QLatin1Char('_') + + country + QLatin1Char('@') + + modifier; + } + // NOTE: Priority is unclear in case both the country and + // the modifier are present. Should really language@modifier be of + // higher priority than language_country? + // In at least one case (Serbian language), it is better this way. + if (!modifier.isEmpty()) { + languages += language + QLatin1Char('@') + modifier; + } + if (!country.isEmpty()) { + languages += language + QLatin1Char('_') + country; + } + languages += language; +} + static void appendLanguagesFromVariable(QStringList &languages, const char *envar, bool isList = false) { @@ -104,30 +128,21 @@ if (isList) { languages += value.split(QLatin1Char(':')); } else { - // Process the value to create possible combinations. - QString language, country, modifier, charset; - splitLocale(value, language, country, modifier, charset); - - if (!country.isEmpty() && !modifier.isEmpty()) { - languages += language + QLatin1Char('_') - + country + QLatin1Char('@') - + modifier; - } - // NOTE: Priority is unclear in case both the country and - // the modifier are present. Should really language@modifier be of - // higher priority than language_country? - // In at least one case (Serbian language), it is better this way. - if (!modifier.isEmpty()) { - languages += language + QLatin1Char('@') + modifier; - } - if (!country.isEmpty()) { - languages += language + QLatin1Char('_') + country; - } - languages += language; + appendLocaleString(languages, value); } } } +#ifndef Q_OS_UNIX +static void appendLanguagesFromQLocale(QStringList &languages, const QLocale &locale) +{ + const QStringList uiLangs = locale.uiLanguages(); + Q_FOREACH (QString value, uiLangs) { + appendLocaleString(languages, value.replace(QLatin1Char('-'), QLatin1Char('_'))); + } +} +#endif + // Extract the first country code from a list of language_COUNTRY strings. // Country code is converted to all lower case letters. static QString extractCountry(const QStringList &languages) @@ -333,6 +348,11 @@ appendLanguagesFromVariable(localeLanguages, "LC_ALL"); appendLanguagesFromVariable(localeLanguages, "LC_MESSAGES"); appendLanguagesFromVariable(localeLanguages, "LANG"); +#ifndef Q_OS_UNIX + // For non UNIX platforms the environment variables might not + // suffice so we add system locale UI languages, too. + appendLanguagesFromQLocale(localeLanguages, QLocale::system()); +#endif } KLocalizedString::KLocalizedString()
