From aa86bde2ae3a539da70278ac31ca571be38c9535 Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Thu, 17 Mar 2022 09:00:42 +0800 Subject: [PATCH] modify language no change --- 0007-modify-language-no-change.patch | 25 +++++++++++++++++++++++++ ukui-control-center.spec | 8 ++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 0007-modify-language-no-change.patch diff --git a/0007-modify-language-no-change.patch b/0007-modify-language-no-change.patch new file mode 100644 index 0000000..46c5d9a --- /dev/null +++ b/0007-modify-language-no-change.patch @@ -0,0 +1,25 @@ +From 2baa22154460489797b4c57217042e5f528661af Mon Sep 17 00:00:00 2001 +From: pei-jiankang +Date: Wed, 16 Mar 2022 16:30:36 +0800 +Subject: [PATCH] modify language no change + +--- + plugins/time-language/area/area.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/time-language/area/area.cpp b/plugins/time-language/area/area.cpp +index 409f894..dc75add 100644 +--- a/plugins/time-language/area/area.cpp ++++ b/plugins/time-language/area/area.cpp +@@ -383,6 +383,8 @@ QStringList Area::getUserDefaultLanguage() { + } else { + qDebug() << "reply failed"; + } ++ if(NULL == language) ++ language = QLocale::system().name(); + result.append(formats); + result.append(language); + return result; +-- +2.33.0 + diff --git a/ukui-control-center.spec b/ukui-control-center.spec index e4709fc..5d6b77b 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: ukui-control-center Version: 3.0.4 -Release: 8 +Release: 9 Summary: utilities to configure the UKUI desktop License: GPL-2+ URL: http://www.ukui.org @@ -12,7 +12,7 @@ Patch03: 0003-fix-power-missing-issue.patch Patch04: 0004-disable-the-str-of-password-check.patch Patch05: 0005-Fix-the-problem-of-displaying-none-in-the-interface-version-information.patch Patch06: 0006-fix-the-problem-that-the-new-user-in-the-control-panel-is-stuck.patch - +Patch07: 0007-modify-language-no-change.patch BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtbase-devel BuildRequires: gsettings-qt-devel @@ -115,6 +115,7 @@ Suggests: ukui-settings-daemon %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build qmake-qt5 @@ -163,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 16 2022 pei-jiankang - 3.0.4-9 +- modify language no change + * Fri Mar 11 2022 huayadong - 3.0.4-8 - add patch6: 0006-fix-the-problem-that-the-new-user-in-the-control-panel-is-stuck.patch -- Gitee