Fix preferred language default errors
This commit is contained in:
parent
ae170a5e92
commit
9a753dec85
25
0008-Fix-preferred-language-default-errors.patch
Normal file
25
0008-Fix-preferred-language-default-errors.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 449655a9a73e8afac4b5d60ea1b4e47553294918 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Mon, 18 Jul 2022 13:42:37 +0800
|
||||
Subject: [PATCH] Fix preferred language default errors
|
||||
|
||||
---
|
||||
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 048f2be..1c10b4e 100644
|
||||
--- a/plugins/time-language/area/area.cpp
|
||||
+++ b/plugins/time-language/area/area.cpp
|
||||
@@ -379,6 +379,8 @@ QStringList Area::getUserDefaultLanguage() {
|
||||
}
|
||||
if(language.isEmpty() && propertyMap.keys().contains("Language")) {
|
||||
language = propertyMap.find("Language").value().toString();
|
||||
+ if(language.isEmpty())
|
||||
+ language = QLocale::system().name();
|
||||
}
|
||||
} else {
|
||||
qDebug() << "reply failed";
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
Name: ukui-control-center
|
||||
Version: 3.0.4
|
||||
Release: 11
|
||||
Release: 12
|
||||
Summary: utilities to configure the UKUI desktop
|
||||
License: GPL-2+
|
||||
URL: http://www.ukui.org
|
||||
@ -13,6 +13,7 @@ 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-icon-theme-not-display.patch
|
||||
Patch08: 0008-Fix-preferred-language-default-errors.patch
|
||||
|
||||
BuildRequires: qt5-qtsvg-devel
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
@ -117,6 +118,7 @@ Suggests: ukui-settings-daemon
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
%build
|
||||
qmake-qt5
|
||||
@ -165,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-12
|
||||
- Fix preferred language default errors
|
||||
|
||||
* Tue Jun 28 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-11
|
||||
- update about.png for openEuler
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user