diff --git a/0002-fix-translation-of-calendar.patch b/0002-fix-translation-of-calendar.patch index 4679f69..2b19899 100644 --- a/0002-fix-translation-of-calendar.patch +++ b/0002-fix-translation-of-calendar.patch @@ -1,33 +1,27 @@ -From 1727c034ae8f43ba607d75503e0d9840bdf497cd Mon Sep 17 00:00:00 2001 +From 364e77f821d31c1cff7dc9bf83d1cbe47b60e7e9 Mon Sep 17 00:00:00 2001 From: peijiankang -Date: Tue, 17 Jan 2023 10:12:33 +0800 +Date: Thu, 29 Jun 2023 17:45:28 +0800 Subject: [PATCH] fix translation of calendar --- - plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp b/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp -index 4c5e743..40686e8 100644 +index 4c5e743..1c4d931 100644 --- a/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp +++ b/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp -@@ -606,8 +606,8 @@ void LunarCalendarWidget::setLocaleCalendar() - { - - QStringList res = getLocale(); -- qDebug()<<"设置区域:"<setText("周日"); -@@ -671,6 +671,8 @@ QStringList LunarCalendarWidget::getLocale() +@@ -668,9 +668,13 @@ QStringList LunarCalendarWidget::getLocale() + propertyMap = reply.value(); + if (propertyMap.keys().contains("FormatsLocale")) { + formats = propertyMap.find("FormatsLocale").value().toString(); ++ if(formats.isEmpty()) ++ formats = QLocale::system().name() + ".UTF-8"; } if(language.isEmpty() && propertyMap.keys().contains("Language")) { language = propertyMap.find("Language").value().toString(); -+ if(language.isEmpty()) -+ language = QLocale::system().name(); ++ if(language.isEmpty()) ++ language = QLocale::system().name() + ".UTF-8"; } } else { qDebug() << "reply failed"; diff --git a/ukui-panel.spec b/ukui-panel.spec index 14dab99..38ac561 100644 --- a/ukui-panel.spec +++ b/ukui-panel.spec @@ -1,6 +1,6 @@ Name: ukui-panel Version: 3.1.0 -Release: 10 +Release: 11 Summary: ukui desktop panel License: LGPL-2.0-or-later and GPL-2.0-or-later and BSD URL: http://www.ukui.org @@ -90,6 +90,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/* %changelog +* Thu Sep 07 2023 peijiankang - 3.1.0-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: update 0002-fix-translation-of-calendar.patch + * Thu Jul 27 2023 peijiankang - 3.1.0-10 - Type:update - ID:NA