Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ki18n for openSUSE:Factory checked in at 2023-03-12 16:23:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ki18n (Old) and /work/SRC/openSUSE:Factory/.ki18n.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ki18n" Sun Mar 12 16:23:13 2023 rev:117 rq:1070890 version:5.104.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ki18n/ki18n.changes 2023-02-13 16:40:18.303122864 +0100 +++ /work/SRC/openSUSE:Factory/.ki18n.new.31432/ki18n.changes 2023-03-12 16:25:02.920976878 +0100 @@ -1,0 +2,11 @@ +Mon Mar 6 09:07:51 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 5.104.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.104.0 +- Changes since 5.103.0: + * KI18nLocaleData target: add include dir for version header to interface + * Load translations for application-specific language also on Win and Mac + +------------------------------------------------------------------- Old: ---- ki18n-5.103.0.tar.xz ki18n-5.103.0.tar.xz.sig New: ---- ki18n-5.104.0.tar.xz ki18n-5.104.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ki18n.spec ++++++ --- /var/tmp/diff_new_pack.kWoWUq/_old 2023-03-12 16:25:03.956981441 +0100 +++ /var/tmp/diff_new_pack.kWoWUq/_new 2023-03-12 16:25:03.960981458 +0100 @@ -17,14 +17,14 @@ %define lname libKF5I18n5 -%define _tar_path 5.103 +%define _tar_path 5.104 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: ki18n -Version: 5.103.0 +Version: 5.104.0 Release: 0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1-or-later ++++++ ki18n-5.103.0.tar.xz -> ki18n-5.104.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.103.0/CMakeLists.txt new/ki18n-5.104.0/CMakeLists.txt --- old/ki18n-5.103.0/CMakeLists.txt 2023-02-05 10:22:13.000000000 +0100 +++ new/ki18n-5.104.0/CMakeLists.txt 2023-03-04 11:03:44.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.103.0") # handled by release scripts +set(KF_VERSION "5.104.0") # handled by release scripts project(KI18n VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.103.0 NO_MODULE) +find_package(ECM 5.104.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.103.0/po/zh_CN/ki18n5.po new/ki18n-5.104.0/po/zh_CN/ki18n5.po --- old/ki18n-5.103.0/po/zh_CN/ki18n5.po 2023-02-05 10:22:13.000000000 +0100 +++ new/ki18n-5.104.0/po/zh_CN/ki18n5.po 2023-03-04 11:03:44.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-09-19 00:41+0000\n" -"PO-Revision-Date: 2023-01-12 10:30\n" +"PO-Revision-Date: 2023-02-24 12:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.103.0/src/i18n/main.cpp new/ki18n-5.104.0/src/i18n/main.cpp --- old/ki18n-5.103.0/src/i18n/main.cpp 2023-02-05 10:22:13.000000000 +0100 +++ new/ki18n-5.104.0/src/i18n/main.cpp 2023-03-04 11:03:44.000000000 +0100 @@ -1,6 +1,6 @@ /* This file is part of the KDE libraries SPDX-FileCopyrightText: 2015 Lukáš Tinkl <lti...@redhat.com> - SPDX-FileCopyrightText: 2021 Ingo Klöcker <kloec...@kde.org> + SPDX-FileCopyrightText: 2021,2023 Ingo Klöcker <kloec...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ @@ -60,6 +60,24 @@ } } +static QLocale getSystemLocale() +{ +#if defined(Q_OS_WIN) || defined(Q_OS_MAC) + // On Windows and Apple OSs, we cannot use QLocale::system() if an application-specific + // language was set by kxmlgui because Qt ignores LANGUAGE on Windows and Apple OSs. + // The following code is a simplified variant of QSystemLocale::fallbackUiLocale() + // (in qlocale_unix.cpp) ignoring LC_ALL, LC_MESSAGES, and LANG. + QString language = qEnvironmentVariable("LANGUAGE"); + if (!language.isEmpty()) { + language = language.split(QLatin1Char{':'}).constFirst(); + if (!language.isEmpty()) { + return QLocale{language}; + } + } +#endif + return QLocale::system(); +} + static void load() { // The way Qt translation system handles plural forms makes it necessary to @@ -68,7 +86,7 @@ // translation for the current locale to overload it. loadCatalog(QStringLiteral("qt_"), QLocale{QStringLiteral("en")}); - const QLocale locale = QLocale::system(); + const QLocale locale = getSystemLocale(); if (locale.name() != QStringLiteral("en")) { loadTranslation(locale.name(), locale.bcp47Name()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-5.103.0/src/localedata/CMakeLists.txt new/ki18n-5.104.0/src/localedata/CMakeLists.txt --- old/ki18n-5.103.0/src/localedata/CMakeLists.txt 2023-02-05 10:22:13.000000000 +0100 +++ new/ki18n-5.104.0/src/localedata/CMakeLists.txt 2023-03-04 11:03:44.000000000 +0100 @@ -34,7 +34,11 @@ EXPORT KI18N ) -target_include_directories(KF5I18nLocaleData INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KI18nLocaleData>") +target_include_directories(KF5I18nLocaleData + INTERFACE + "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KI18nLocaleData>" + "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KI18n>" # for version header +) target_link_libraries(KF5I18nLocaleData PUBLIC Qt${QT_MAJOR_VERSION}::Core) target_link_libraries(KF5I18nLocaleData PRIVATE KF5I18n)
