From f988b31158f5c621b08a3ca1952fa9ee5105b9bb Mon Sep 17 00:00:00 2001 From: sjxur Date: Tue, 4 Apr 2023 17:12:12 +0800 Subject: [PATCH 1/2] fix:issue#I6PZC5 --- 10000-fix-issue-I6PZC5.patch | 135 +++++++++++++++++++++++++++++++++++ dde-control-center.spec | 3 + 2 files changed, 138 insertions(+) create mode 100644 10000-fix-issue-I6PZC5.patch diff --git a/10000-fix-issue-I6PZC5.patch b/10000-fix-issue-I6PZC5.patch new file mode 100644 index 0000000..b5bd79f --- /dev/null +++ b/10000-fix-issue-I6PZC5.patch @@ -0,0 +1,135 @@ +From 2a95d2d36b2915bc368a881d3e207f372bed5abc Mon Sep 17 00:00:00 2001 +From: sjxur +Date: Tue, 4 Apr 2023 16:43:04 +0800 +Subject: [PATCH] =?UTF-8?q?fix=20issue:I6PZC5=20=E5=88=9B=E5=BB=BA?= + =?UTF-8?q?=E9=87=8D=E5=A4=8D=E2=80=9C=E5=85=A8=E5=90=8D=E2=80=9D=E7=9A=84?= + =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BF=A1?= + =?UTF-8?q?=E6=81=AF=E6=9C=89=E8=AF=AF?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + .../window/modules/accounts/accountsdetailwidget.cpp | 2 +- + src/frame/window/modules/accounts/createaccountpage.cpp | 2 +- + translations/dde-control-center_zh_CN.ts | 8 ++------ + translations/dde-control-center_zh_HK.ts | 8 ++------ + translations/dde-control-center_zh_TW.ts | 8 ++------ + 5 files changed, 8 insertions(+), 20 deletions(-) + +diff --git a/src/frame/window/modules/accounts/accountsdetailwidget.cpp b/src/frame/window/modules/accounts/accountsdetailwidget.cpp +index b8ad19c..5f6b8a1 100644 +--- a/src/frame/window/modules/accounts/accountsdetailwidget.cpp ++++ b/src/frame/window/modules/accounts/accountsdetailwidget.cpp +@@ -297,7 +297,7 @@ void AccountsDetailWidget::initUserInfo(QVBoxLayout *layout) + for (User *user : userList) { + if (userFullName == user->fullname()) { + m_inputLineEdit->setAlert(true); +- m_inputLineEdit->showAlertMessage(tr("The username already exists"), m_inputLineEdit, 2000); ++ m_inputLineEdit->showAlertMessage(tr("The name already exists"), m_inputLineEdit, 2000); + m_inputLineEdit->lineEdit()->selectAll(); + return; + } +diff --git a/src/frame/window/modules/accounts/createaccountpage.cpp b/src/frame/window/modules/accounts/createaccountpage.cpp +index 2a43c85..92e04d2 100644 +--- a/src/frame/window/modules/accounts/createaccountpage.cpp ++++ b/src/frame/window/modules/accounts/createaccountpage.cpp +@@ -477,7 +477,7 @@ bool CreateAccountPage::checkFullname() + for (User *user : userList) { + if (userFullName == user->fullname()) { + m_fullnameEdit->setAlert(true); +- m_fullnameEdit->showAlertMessage(tr("The username already exists"), m_fullnameEdit, 2000); ++ m_fullnameEdit->showAlertMessage(tr("The name already exists"), m_fullnameEdit, 2000); + m_fullnameEdit->lineEdit()->selectAll(); + return false; + } +diff --git a/translations/dde-control-center_zh_CN.ts b/translations/dde-control-center_zh_CN.ts +index e710df8..4b8bbfe 100644 +--- a/translations/dde-control-center_zh_CN.ts ++++ b/translations/dde-control-center_zh_CN.ts +@@ -200,14 +200,11 @@ + + + ++ ++ + The name already exists + 该名称已存在 + +- +- +- The username already exists +- 此用户名已存在 +- + + + Validity Days +@@ -430,7 +427,6 @@ + + + +- + The username already exists + 此用户名已存在 + +diff --git a/translations/dde-control-center_zh_HK.ts b/translations/dde-control-center_zh_HK.ts +index d13eba8..f26f796 100644 +--- a/translations/dde-control-center_zh_HK.ts ++++ b/translations/dde-control-center_zh_HK.ts +@@ -200,14 +200,11 @@ + + + ++ ++ + The name already exists + 該名稱已存在 + +- +- +- The username already exists +- 此用戶名已存在 +- + + + Validity Days +@@ -430,7 +427,6 @@ + + + +- + The username already exists + 此用戶名已存在 + +diff --git a/translations/dde-control-center_zh_TW.ts b/translations/dde-control-center_zh_TW.ts +index 2965e9a..b51e0a9 100644 +--- a/translations/dde-control-center_zh_TW.ts ++++ b/translations/dde-control-center_zh_TW.ts +@@ -200,14 +200,11 @@ + + + ++ ++ + The name already exists + 該名稱已存在 + +- +- +- The username already exists +- 使用者名稱已經存在 +- + + + Validity Days +@@ -430,7 +427,6 @@ + + + +- + The username already exists + 使用者名稱已經存在 + +-- +2.33.0 + diff --git a/dde-control-center.spec b/dde-control-center.spec index c4e6fd8..96119e9 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,6 +1,7 @@ %define specrelease 1%{?dist} %if 0%{?openeuler} %define specrelease 4 +%define specrelease 5 %endif Name: dde-control-center @@ -11,6 +12,7 @@ License: GPLv3 URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-hide-authorized.patch +Patch1: 10000-fix-issue-I6PZC5.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -111,6 +113,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %changelog * Wed Aug 10 2022 liweiganga - 5.4.43.27-4 - fix: issue#I5LI5A +- fix: issue#I6PZC5 * Fri Aug 05 2022 liweiganga - 5.4.43.27-3 - hide authorized -- Gitee From 11752a9068f10c274e00e39c62ae8591e825abdd Mon Sep 17 00:00:00 2001 From: sjxur Date: Tue, 4 Apr 2023 17:12:12 +0800 Subject: [PATCH 2/2] fix:issue#I6PZC5 --- 10000-fix-issue-I6PZC5.patch | 135 +++++++++++++++++++++++++++++++++++ dde-control-center.spec | 5 ++ 2 files changed, 140 insertions(+) create mode 100644 10000-fix-issue-I6PZC5.patch diff --git a/10000-fix-issue-I6PZC5.patch b/10000-fix-issue-I6PZC5.patch new file mode 100644 index 0000000..b5bd79f --- /dev/null +++ b/10000-fix-issue-I6PZC5.patch @@ -0,0 +1,135 @@ +From 2a95d2d36b2915bc368a881d3e207f372bed5abc Mon Sep 17 00:00:00 2001 +From: sjxur +Date: Tue, 4 Apr 2023 16:43:04 +0800 +Subject: [PATCH] =?UTF-8?q?fix=20issue:I6PZC5=20=E5=88=9B=E5=BB=BA?= + =?UTF-8?q?=E9=87=8D=E5=A4=8D=E2=80=9C=E5=85=A8=E5=90=8D=E2=80=9D=E7=9A=84?= + =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BF=A1?= + =?UTF-8?q?=E6=81=AF=E6=9C=89=E8=AF=AF?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + .../window/modules/accounts/accountsdetailwidget.cpp | 2 +- + src/frame/window/modules/accounts/createaccountpage.cpp | 2 +- + translations/dde-control-center_zh_CN.ts | 8 ++------ + translations/dde-control-center_zh_HK.ts | 8 ++------ + translations/dde-control-center_zh_TW.ts | 8 ++------ + 5 files changed, 8 insertions(+), 20 deletions(-) + +diff --git a/src/frame/window/modules/accounts/accountsdetailwidget.cpp b/src/frame/window/modules/accounts/accountsdetailwidget.cpp +index b8ad19c..5f6b8a1 100644 +--- a/src/frame/window/modules/accounts/accountsdetailwidget.cpp ++++ b/src/frame/window/modules/accounts/accountsdetailwidget.cpp +@@ -297,7 +297,7 @@ void AccountsDetailWidget::initUserInfo(QVBoxLayout *layout) + for (User *user : userList) { + if (userFullName == user->fullname()) { + m_inputLineEdit->setAlert(true); +- m_inputLineEdit->showAlertMessage(tr("The username already exists"), m_inputLineEdit, 2000); ++ m_inputLineEdit->showAlertMessage(tr("The name already exists"), m_inputLineEdit, 2000); + m_inputLineEdit->lineEdit()->selectAll(); + return; + } +diff --git a/src/frame/window/modules/accounts/createaccountpage.cpp b/src/frame/window/modules/accounts/createaccountpage.cpp +index 2a43c85..92e04d2 100644 +--- a/src/frame/window/modules/accounts/createaccountpage.cpp ++++ b/src/frame/window/modules/accounts/createaccountpage.cpp +@@ -477,7 +477,7 @@ bool CreateAccountPage::checkFullname() + for (User *user : userList) { + if (userFullName == user->fullname()) { + m_fullnameEdit->setAlert(true); +- m_fullnameEdit->showAlertMessage(tr("The username already exists"), m_fullnameEdit, 2000); ++ m_fullnameEdit->showAlertMessage(tr("The name already exists"), m_fullnameEdit, 2000); + m_fullnameEdit->lineEdit()->selectAll(); + return false; + } +diff --git a/translations/dde-control-center_zh_CN.ts b/translations/dde-control-center_zh_CN.ts +index e710df8..4b8bbfe 100644 +--- a/translations/dde-control-center_zh_CN.ts ++++ b/translations/dde-control-center_zh_CN.ts +@@ -200,14 +200,11 @@ + + + ++ ++ + The name already exists + 该名称已存在 + +- +- +- The username already exists +- 此用户名已存在 +- + + + Validity Days +@@ -430,7 +427,6 @@ + + + +- + The username already exists + 此用户名已存在 + +diff --git a/translations/dde-control-center_zh_HK.ts b/translations/dde-control-center_zh_HK.ts +index d13eba8..f26f796 100644 +--- a/translations/dde-control-center_zh_HK.ts ++++ b/translations/dde-control-center_zh_HK.ts +@@ -200,14 +200,11 @@ + + + ++ ++ + The name already exists + 該名稱已存在 + +- +- +- The username already exists +- 此用戶名已存在 +- + + + Validity Days +@@ -430,7 +427,6 @@ + + + +- + The username already exists + 此用戶名已存在 + +diff --git a/translations/dde-control-center_zh_TW.ts b/translations/dde-control-center_zh_TW.ts +index 2965e9a..b51e0a9 100644 +--- a/translations/dde-control-center_zh_TW.ts ++++ b/translations/dde-control-center_zh_TW.ts +@@ -200,14 +200,11 @@ + + + ++ ++ + The name already exists + 該名稱已存在 + +- +- +- The username already exists +- 使用者名稱已經存在 +- + + + Validity Days +@@ -430,7 +427,6 @@ + + + +- + The username already exists + 使用者名稱已經存在 + +-- +2.33.0 + diff --git a/dde-control-center.spec b/dde-control-center.spec index c4e6fd8..68c724a 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,6 +1,7 @@ %define specrelease 1%{?dist} %if 0%{?openeuler} %define specrelease 4 +%define specrelease 5 %endif Name: dde-control-center @@ -11,6 +12,7 @@ License: GPLv3 URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-hide-authorized.patch +Patch1: 10000-fix-issue-I6PZC5.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -109,6 +111,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Tue Apr 4 2023 sjxur - 5.4.43.27-5 +- fix: issue#I6PZC5 + * Wed Aug 10 2022 liweiganga - 5.4.43.27-4 - fix: issue#I5LI5A -- Gitee