Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2015-04-13 20:23:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-03-16 09:29:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ki18n.new/ki18n.changes 2015-04-13 20:23:56.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Apr 4 14:40:37 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.9.0 + * Reload the global Qt catalog when using i18n() + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php + +------------------------------------------------------------------- Old: ---- ki18n-5.8.0.tar.xz New: ---- ki18n-5.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.YsHJiT/_old 2015-04-13 20:23:57.000000000 +0200 +++ /var/tmp/diff_new_pack.YsHJiT/_new 2015-04-13 20:23:57.000000000 +0200 @@ -16,13 +16,14 @@ # +%bcond_without lang %define lname libKF5I18n5 -%define _tar_path 5.8 +%define _tar_path 5.9 Name: ki18n -Version: %{_tar_path}.0 +Version: 5.9.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: gettext-runtime BuildRequires: kf5-filesystem @@ -51,7 +52,9 @@ Summary: KDE Gettext-based UI text internationalization Group: System/GUI/KDE Obsoletes: libKF5I18n4 +%if %{with lang} Recommends: %lname-lang = %{version} +%endif %requires_ge libQt5Core5 %requires_ge libQt5Script5 @@ -87,18 +90,21 @@ %install %kf5_makeinstall -C build - %fdupes -s %{buildroot} + %fdupes %{buildroot} - %find_lang %{name}5 +%if %{with lang} +%find_lang %{name}5 +echo "%dir %{_kf5_sharedir}/locale/*/LC_SCRIPTS" >>%{name}5.lang +echo "%{_kf5_sharedir}/locale/*/LC_SCRIPTS/ki18n5/" >>%{name}5.lang +%endif %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%if %{with lang} %files -n %lname-lang -f %{name}5.lang -%defattr(-,root,root) -%dir %{_kf5_sharedir}/locale/*/LC_SCRIPTS -%{_kf5_sharedir}/locale/*/LC_SCRIPTS/ki18n5/ +%endif %files -n %lname %defattr(-,root,root) ++++++ ki18n-5.8.0.tar.xz -> ki18n-5.9.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.8.0/CMakeLists.txt new/ki18n-5.9.0/CMakeLists.txt --- old/ki18n-5.8.0/CMakeLists.txt 2015-03-07 15:43:57.000000000 +0100 +++ new/ki18n-5.9.0/CMakeLists.txt 2015-04-04 14:05:57.000000000 +0200 @@ -3,7 +3,7 @@ project(KI18n) # ECM setup -find_package(ECM 1.8.0 REQUIRED NO_MODULE) +find_package(ECM 5.9.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(FeatureSummary) @@ -12,7 +12,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.8.0") # handled by release scripts +set(KF5_VERSION "5.9.0") # handled by release scripts ecm_setup_version( ${KF5_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.8.0/po/gl/ki18n5.po new/ki18n-5.9.0/po/gl/ki18n5.po --- old/ki18n-5.8.0/po/gl/ki18n5.po 2015-03-07 15:43:57.000000000 +0100 +++ new/ki18n-5.9.0/po/gl/ki18n5.po 2015-04-04 14:05:57.000000000 +0200 @@ -9,13 +9,14 @@ # Marce Villarino <mvillar...@kde-espana.es>, 2009, 2010, 2011, 2012. # Xosé <xoseca...@gmail.com>, 2010. # Marce Villarino <mvillar...@kde-espana.es>, 2011, 2012, 2013, 2014. +# Adrián Chaves Fernández <adriyeticha...@gmail.com>, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-01-26 07:50+0000\n" -"PO-Revision-Date: 2014-05-13 23:05+0200\n" -"Last-Translator: Marce Villarino <mvillar...@kde-espana.org>\n" +"PO-Revision-Date: 2015-03-14 06:30+0100\n" +"Last-Translator: Adrián Chaves Fernández <adriyeticha...@gmail.com>\n" "Language-Team: Galician <kde-i18n-...@kde.org>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -246,92 +247,64 @@ msgstr "Win" #: kuitmarkup.cpp:362 -#, fuzzy -#| msgctxt "keyboard-key-name" -#| msgid "F%1" msgctxt "keyboard-key-name" msgid "F1" -msgstr "F%1" +msgstr "F1" #: kuitmarkup.cpp:363 -#, fuzzy -#| msgid "2" msgctxt "keyboard-key-name" msgid "F2" -msgstr "2" +msgstr "F2" #: kuitmarkup.cpp:364 -#, fuzzy -#| msgid "3" msgctxt "keyboard-key-name" msgid "F3" -msgstr "3" +msgstr "F3" #: kuitmarkup.cpp:365 -#, fuzzy -#| msgid "4" msgctxt "keyboard-key-name" msgid "F4" -msgstr "4" +msgstr "F4" #: kuitmarkup.cpp:366 -#, fuzzy -#| msgid "5" msgctxt "keyboard-key-name" msgid "F5" -msgstr "5" +msgstr "F5" #: kuitmarkup.cpp:367 -#, fuzzy -#| msgid "6" msgctxt "keyboard-key-name" msgid "F6" -msgstr "6" +msgstr "F6" #: kuitmarkup.cpp:368 -#, fuzzy -#| msgid "7" msgctxt "keyboard-key-name" msgid "F7" -msgstr "7" +msgstr "F7" #: kuitmarkup.cpp:369 -#, fuzzy -#| msgid "8" msgctxt "keyboard-key-name" msgid "F8" -msgstr "8" +msgstr "F8" #: kuitmarkup.cpp:370 -#, fuzzy -#| msgid "9" msgctxt "keyboard-key-name" msgid "F9" -msgstr "9" +msgstr "F9" #: kuitmarkup.cpp:371 -#, fuzzy -#| msgctxt "keyboard-key-name" -#| msgid "F%1" msgctxt "keyboard-key-name" msgid "F10" -msgstr "F%1" +msgstr "F10" #: kuitmarkup.cpp:372 -#, fuzzy -#| msgctxt "keyboard-key-name" -#| msgid "F%1" msgctxt "keyboard-key-name" msgid "F11" -msgstr "F%1" +msgstr "F11" #: kuitmarkup.cpp:373 -#, fuzzy -#| msgctxt "keyboard-key-name" -#| msgid "F%1" msgctxt "keyboard-key-name" msgid "F12" -msgstr "F%1" +msgstr "F12" #. i18n: The messages with context "tag-format-pattern <tag ...> format" #. are KUIT patterns for formatting the text found inside KUIT tags. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.8.0/po/ru/scripts/ki18n5/ki18n5.js new/ki18n-5.9.0/po/ru/scripts/ki18n5/ki18n5.js --- old/ki18n-5.8.0/po/ru/scripts/ki18n5/ki18n5.js 1970-01-01 01:00:00.000000000 +0100 +++ new/ki18n-5.9.0/po/ru/scripts/ki18n5/ki18n5.js 2015-04-04 14:05:57.000000000 +0200 @@ -0,0 +1,65 @@ +// ki18n5.js of Russian KDE translation + +// Return the phrase without the given prefix if it has it, +// or the full phrase otherwise. +// Thanks to Chusslove Ilich from Serbian team +function without_prefix (prefix, phrase) +{ + if (phrase.indexOf(prefix) == 0) { + phrase = phrase.substr(prefix.length); + } + return phrase; +} + +//-------------------------------------------------------------------- +// This pair of functions can be used for storing/restoring +// any additional form. This is reasonable, because in most +// cases only 2 forms are used. +function setStash(text) +{ + Ts.setProp(Ts.msgstrf(), "S", text); +} + +function inStash(arg) +{ + return Ts.getProp(arg, "S") +} + +//-------------------------------------------------------------------- +function replaceMultiplePairs(/* text, pattern1, replacement1, ... */) +{ + if (arguments.length % 2 != 1) + throw Error("replaceMultiplePairs requires odd number of arguments."); + + var text = arguments[0]; + for (var i = 1; i < arguments.length; i += 2) + { + text = text.replace(arguments[i], arguments[i + 1]); + } + + return text; +} + +function replaceMultiplePairsExact(/* text, pattern1, replacement1, ... */) +{ + if (arguments.length % 2 != 1) + throw Error("replaceMultiplePairsExact requires odd number of arguments."); + + var text = arguments[0]; + for (var i = 1; i < arguments.length; i += 2) + { + if (text == arguments[i]) + text = arguments[i + 1]; + } + + return text; +} + +//-------------------------------------------------------------------- +Ts.setcall("wo-prefix", without_prefix); + +Ts.setcall("store", setStash); +Ts.setcall("restore", inStash); + +Ts.setcall("replace-pairs", replaceMultiplePairs); +Ts.setcall("replace-pairs-exact", replaceMultiplePairsExact); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.8.0/po/uk/scripts/ki18n5/ki18n5.js new/ki18n-5.9.0/po/uk/scripts/ki18n5/ki18n5.js --- old/ki18n-5.8.0/po/uk/scripts/ki18n5/ki18n5.js 1970-01-01 01:00:00.000000000 +0100 +++ new/ki18n-5.9.0/po/uk/scripts/ki18n5/ki18n5.js 2015-04-04 14:05:57.000000000 +0200 @@ -0,0 +1,66 @@ +// kdelibs4.js of Ukrainian KDE translation + +// ------------------------------ +// Pick a phrase depending on a dynamic context field. +// Input is the keyword of the context field, followed by pairs of +// regex matcher on context value and corresponding phrase, +// and optionally followed by default phrase in case the value does not match. +// If the value does not match and default phrase is not given, +// fallback is signaled. +// If requested dynamic context field does not exist, fallback is signaled. +function select_by_context (/* ctxt_key, + valrx_1, phrase_1, ..., valrx_N, phrase_N + [, default_phrase]*/) +{ + if (arguments.length < 1) + throw Error("Selector by context takes at least the context keyword."); + + var ctxtkey = arguments[0]; + var ctxtval = Ts.dynctxt(ctxtkey); + + var phrase; + for (var i = 1; i < arguments.length; i += 2) { + if (ctxtval.match(RegExp(arguments[i]))) { + phrase = arguments[i + 1]; + break; + } + } + if (phrase == undefined) { + if (arguments.length % 2 == 0) { + phrase = arguments[arguments.length - 1]; + } else { + throw Ts.fallback(); + } + } + + return phrase; +} +Ts.setcall("за-контекстом", select_by_context); + +// Return the phrase without the given prefix if it has it, +// or the full phrase otherwise. +// Thanks to Chusslove Ilich from Serbian team +function without_prefix (prefix, phrase) +{ + if (phrase.indexOf(prefix) == 0) { + phrase = phrase.substr(prefix.length); + } + return phrase; +} +Ts.setcall("без-префікса", without_prefix); + +// Simple replacer. Thanks to Alexander Potashev from Russian team +function replaceMultiplePairs(/* text, pattern1, replacement1, ... */) +{ + if (arguments.length % 2 != 1) + throw Error("replaceMultiplePairs requires odd number of arguments."); + + var text = arguments[0]; + for (var i = 1; i < arguments.length; i += 2) + { + text = text.replace(arguments[i], arguments[i + 1]); + } + + return text; +} +Ts.setcall("заміна-пар", replaceMultiplePairs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.8.0/src/CMakeLists.txt new/ki18n-5.9.0/src/CMakeLists.txt --- old/ki18n-5.8.0/src/CMakeLists.txt 2015-03-07 15:43:57.000000000 +0100 +++ new/ki18n-5.9.0/src/CMakeLists.txt 2015-04-04 14:05:57.000000000 +0200 @@ -4,6 +4,7 @@ kcatalog.cpp kuitmarkup.cpp common_helpers.cpp + main.cpp ) add_library(KF5I18n ${libki18n_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.8.0/src/main.cpp new/ki18n-5.9.0/src/main.cpp --- old/ki18n-5.8.0/src/main.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/ki18n-5.9.0/src/main.cpp 2015-04-04 14:05:57.000000000 +0200 @@ -0,0 +1,53 @@ +/* This file is part of the KDE libraries + Copyright (C) 2015 Lukáš Tinkl <lti...@redhat.com> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include <QCoreApplication> +#include <QLocale> +#include <QLibraryInfo> +#include <QTranslator> + +// load global Qt translation, needed in KDE e.g. by lots of builtin dialogs (QColorDialog, QFontDialog) that we use +static bool loadTranslation(const QString &localeName) +{ + QTranslator *translator = new QTranslator(QCoreApplication::instance()); + if (!translator->load(QLocale(localeName), QStringLiteral("qt_"), QString(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { + delete translator; + return false; + } + QCoreApplication::instance()->installTranslator(translator); + return true; +} + +static void load() +{ + // The way Qt translation system handles plural forms makes it necessary to + // have a translation file which contains only plural forms for `en`. That's + // why we load the `en` translation unconditionally, then load the + // translation for the current locale to overload it. + loadTranslation(QStringLiteral("en")); + + QLocale locale = QLocale::system(); + if (locale.name() != QStringLiteral("en")) { + if (!loadTranslation(locale.name())) { + loadTranslation(locale.bcp47Name()); + } + } +} + +Q_COREAPP_STARTUP_FUNCTION(load)
