685 lines
37 KiB
Diff
685 lines
37 KiB
Diff
From dfba753be5a293317f9572177953020143304aa5 Mon Sep 17 00:00:00 2001
|
|
From: luoqing <luoqing luoqing@kylinos.com.cn>
|
|
Date: Mon, 21 Feb 2022 17:56:57 +0800
|
|
Subject: [PATCH] fix(create user):Remove the prefix "Create User Failed"
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 去掉前缀“创建用户失败”
|
|
|
|
Closes #47439
|
|
---
|
|
src/hard-worker.cpp | 24 +++-
|
|
.../create-user-page/create-user-page.cpp | 7 ++
|
|
translations/kiran-cpanel-account.zh_CN.ts | 115 +++++-------------
|
|
3 files changed, 59 insertions(+), 87 deletions(-)
|
|
|
|
diff --git a/src/hard-worker.cpp b/src/hard-worker.cpp
|
|
index 3ab232c..ab1048b 100644
|
|
--- a/src/hard-worker.cpp
|
|
+++ b/src/hard-worker.cpp
|
|
@@ -43,8 +43,8 @@ void HardWorker::doCreateUser(QString userName,
|
|
ACCOUNTS_OBJECT_PATH,
|
|
QDBusConnection::systemBus());
|
|
QString userObjPath;
|
|
- QString errMsgPrefix = tr("Create User failed");
|
|
QString errMsgDetail;
|
|
+ QString errMsgPrefix = "";
|
|
|
|
///step1.创建用户
|
|
QDBusPendingReply<QDBusObjectPath> createUserRep;
|
|
@@ -55,6 +55,7 @@ void HardWorker::doCreateUser(QString userName,
|
|
createUserRep.waitForFinished();
|
|
if (createUserRep.isError())
|
|
{
|
|
+ errMsgPrefix = tr("Create User Failed");
|
|
KLOG_WARNING() << "create user failed," << createUserRep.error();
|
|
errMsgDetail = createUserRep.error().message();
|
|
goto failed;
|
|
@@ -129,13 +130,26 @@ failed:
|
|
}
|
|
}
|
|
#endif
|
|
+ //#47439 去掉前缀“创建用户失败”
|
|
QString errMsg = errMsgPrefix;
|
|
- if (!errMsgDetail.isEmpty())
|
|
+ if (!errMsg.isEmpty())
|
|
{
|
|
- errMsg.append(",");
|
|
- errMsg.append(errMsgDetail);
|
|
+ if (!errMsgDetail.isEmpty())
|
|
+ {
|
|
+ errMsg.append(",");
|
|
+ errMsg.append(errMsgDetail);
|
|
+ }
|
|
+ emit sigCreateUserDnoe(userObjPath, errMsg);
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if(errMsgDetail.isEmpty())
|
|
+ {
|
|
+ errMsgDetail = tr("Unknown Error");
|
|
+ }
|
|
+ emit sigCreateUserDnoe(userObjPath, errMsgDetail);
|
|
}
|
|
- emit sigCreateUserDnoe(userObjPath, errMsg);
|
|
+
|
|
}
|
|
|
|
void HardWorker::doUpdatePasswd(QString objPath,
|
|
diff --git a/src/pages/create-user-page/create-user-page.cpp b/src/pages/create-user-page/create-user-page.cpp
|
|
index 7f3956e..ff17a47 100644
|
|
--- a/src/pages/create-user-page/create-user-page.cpp
|
|
+++ b/src/pages/create-user-page/create-user-page.cpp
|
|
@@ -31,6 +31,8 @@
|
|
#include <QMessageBox>
|
|
#include <QMouseEvent>
|
|
|
|
+#define ERROR_MESSAGE_CREATE_USER_FAILED "Create User Failed"
|
|
+
|
|
CreateUserPage::CreateUserPage(QWidget *parent) : QWidget(parent),
|
|
ui(new Ui::CreateUserPage)
|
|
{
|
|
@@ -236,6 +238,7 @@ void CreateUserPage::handlerCreateNewUser()
|
|
iconFile);
|
|
}
|
|
|
|
+
|
|
void CreateUserPage::handlerCreateNewUserIsDone(QString userPath,
|
|
QString errMsg)
|
|
{
|
|
@@ -247,6 +250,10 @@ void CreateUserPage::handlerCreateNewUserIsDone(QString userPath,
|
|
}
|
|
else if(!errMsg.isEmpty() && !userPath.isEmpty())
|
|
{
|
|
+ if(errMsg.startsWith(ERROR_MESSAGE_CREATE_USER_FAILED))
|
|
+ {
|
|
+ KiranMessageBox::message(nullptr,tr("Error"),errMsg,KiranMessageBox::Ok);
|
|
+ }
|
|
KiranMessageBox::message(nullptr,tr("Warning"),errMsg,KiranMessageBox::Ok);
|
|
}
|
|
|
|
diff --git a/translations/kiran-cpanel-account.zh_CN.ts b/translations/kiran-cpanel-account.zh_CN.ts
|
|
index 6b430c9..7cd427f 100644
|
|
--- a/translations/kiran-cpanel-account.zh_CN.ts
|
|
+++ b/translations/kiran-cpanel-account.zh_CN.ts
|
|
@@ -6,14 +6,12 @@
|
|
<message>
|
|
<location filename="../src/widgets/account-itemwidget.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_account-itemwidget.h" line="83"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_account-itemwidget.h" line="83"/>
|
|
<source>Form</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/widgets/account-itemwidget.ui" line="63"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_account-itemwidget.h" line="84"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_account-itemwidget.h" line="84"/>
|
|
<source>Tom Hardy</source>
|
|
<translation></translation>
|
|
</message>
|
|
@@ -43,35 +41,30 @@
|
|
<message>
|
|
<location filename="../src/pages/advance-settings-page/advance-settings.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="203"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="203"/>
|
|
<source>Form</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/advance-settings-page/advance-settings.ui" line="43"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="204"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="204"/>
|
|
<source>Login shell</source>
|
|
<translation>登录Shell</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/advance-settings-page/advance-settings.ui" line="89"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="205"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="205"/>
|
|
<source>Specify user id</source>
|
|
<translation>指定用户ID</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/advance-settings-page/advance-settings.ui" line="262"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="207"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="207"/>
|
|
<source>confirm</source>
|
|
<translation>确认</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/advance-settings-page/advance-settings.ui" line="303"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="208"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="208"/>
|
|
<source>cancel</source>
|
|
<translation>取消</translation>
|
|
</message>
|
|
@@ -84,7 +77,6 @@
|
|
<message>
|
|
<location filename="../src/pages/advance-settings-page/advance-settings.ui" line="159"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="206"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_advance-settings.h" line="206"/>
|
|
<source>Specify user home</source>
|
|
<translation>指定用户目录</translation>
|
|
</message>
|
|
@@ -109,42 +101,36 @@
|
|
<message>
|
|
<location filename="../src/pages/auth-manager-page/auth-manager-page.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="179"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="179"/>
|
|
<source>AuthManagerPage</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/auth-manager-page/auth-manager-page.ui" line="47"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="180"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="180"/>
|
|
<source>Fingerprint Authentication</source>
|
|
<translation>指纹认证</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/auth-manager-page/auth-manager-page.ui" line="91"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="181"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="181"/>
|
|
<source>Face Authentication</source>
|
|
<translation>人脸认证</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/auth-manager-page/auth-manager-page.ui" line="134"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="182"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="182"/>
|
|
<source>Password Authentication</source>
|
|
<translation>密码认证</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/auth-manager-page/auth-manager-page.ui" line="208"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="183"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="183"/>
|
|
<source>save</source>
|
|
<translation>保存</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/auth-manager-page/auth-manager-page.ui" line="249"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="184"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_auth-manager-page.h" line="184"/>
|
|
<source>return</source>
|
|
<translation>返回</translation>
|
|
</message>
|
|
@@ -186,21 +172,18 @@
|
|
<message>
|
|
<location filename="../src/widgets/biometric-item.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_biometric-item.h" line="77"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_biometric-item.h" line="77"/>
|
|
<source>BiometricItem</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/widgets/biometric-item.ui" line="35"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_biometric-item.h" line="78"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_biometric-item.h" line="78"/>
|
|
<source>text</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/widgets/biometric-item.ui" line="73"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_biometric-item.h" line="79"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_biometric-item.h" line="79"/>
|
|
<source>add</source>
|
|
<translation>添加</translation>
|
|
</message>
|
|
@@ -212,68 +195,60 @@
|
|
<translation type="vanished">账户类型</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="84"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="86"/>
|
|
<source>standard</source>
|
|
<translation>普通用户</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="85"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="87"/>
|
|
<source>administrator</source>
|
|
<translation>管理员</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/create-user-page/create-user-page.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="286"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="286"/>
|
|
<source>Form</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/create-user-page/create-user-page.ui" line="101"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="287"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="287"/>
|
|
<source>User name</source>
|
|
<translation>用户名</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/create-user-page/create-user-page.ui" line="147"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="288"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="288"/>
|
|
<source>User type</source>
|
|
<translation>用户类型</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/create-user-page/create-user-page.ui" line="190"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="289"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="289"/>
|
|
<source>Password</source>
|
|
<translation>用户密码</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/create-user-page/create-user-page.ui" line="239"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="290"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="290"/>
|
|
<source>Confirm password</source>
|
|
<translation>确认密码</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/create-user-page/create-user-page.ui" line="294"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="291"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="291"/>
|
|
<source>Advance setting</source>
|
|
<translation>高级设置</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/create-user-page/create-user-page.ui" line="389"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="292"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="292"/>
|
|
<source>Confirm</source>
|
|
<translation>创建</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/create-user-page/create-user-page.ui" line="436"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="293"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_create-user-page.h" line="293"/>
|
|
<source>Cancel</source>
|
|
<translation>取消</translation>
|
|
</message>
|
|
@@ -298,55 +273,56 @@
|
|
<translation type="vanished">请输入用户名</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="108"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="110"/>
|
|
<source>Please enter user name first</source>
|
|
<translation>请输入用户名</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="142"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="144"/>
|
|
<source>Please enter your user name</source>
|
|
<translation>请输入用户名</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="158"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="160"/>
|
|
<source>user name cannot be a pure number</source>
|
|
<translation>用户名不能全为数字</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="165"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="167"/>
|
|
<source>user name already exists</source>
|
|
<translation>用户名已存在</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="177"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="179"/>
|
|
<source>Please enter your password</source>
|
|
- <translation type="unfinished">请输入密码</translation>
|
|
+ <translation>请输入密码</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="184"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="186"/>
|
|
<source>Please enter the password again</source>
|
|
<translation>请再次输入密码</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="191"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="193"/>
|
|
<source>The password you enter must be the same as the former one</source>
|
|
<translation>两次密码不相同，请核对后，再次输入</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="211"/>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="247"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="213"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="249"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="255"/>
|
|
<source>Error</source>
|
|
<translation>错误</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="211"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="213"/>
|
|
<source>Password encryption failed</source>
|
|
<translation>密码加密失败</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/pages/create-user-page/create-user-page.cpp" line="251"/>
|
|
+ <location filename="../src/pages/create-user-page/create-user-page.cpp" line="257"/>
|
|
<source>Warning</source>
|
|
- <translation type="unfinished">警告</translation>
|
|
+ <translation>警告</translation>
|
|
</message>
|
|
</context>
|
|
<context>
|
|
@@ -354,28 +330,24 @@
|
|
<message>
|
|
<location filename="../src/pages/biometric-enroll-dialog/face-enroll-dialog/face-enroll-dialog.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_face-enroll-dialog.h" line="122"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_face-enroll-dialog.h" line="122"/>
|
|
<source>FaceEnrollDialog</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/biometric-enroll-dialog/face-enroll-dialog/face-enroll-dialog.ui" line="63"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_face-enroll-dialog.h" line="123"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_face-enroll-dialog.h" line="123"/>
|
|
<source>balabalalbala...</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/biometric-enroll-dialog/face-enroll-dialog/face-enroll-dialog.ui" line="121"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_face-enroll-dialog.h" line="124"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_face-enroll-dialog.h" line="124"/>
|
|
<source>save</source>
|
|
<translation>保存</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/biometric-enroll-dialog/face-enroll-dialog/face-enroll-dialog.ui" line="159"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_face-enroll-dialog.h" line="125"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_face-enroll-dialog.h" line="125"/>
|
|
<source>cancel</source>
|
|
<translation>取消</translation>
|
|
</message>
|
|
@@ -424,28 +396,24 @@
|
|
<message>
|
|
<location filename="../src/pages/biometric-enroll-dialog/fingerprint-enroll-dialog/fingerprint-enroll-dialog.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_fingerprint-enroll-dialog.h" line="131"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_fingerprint-enroll-dialog.h" line="131"/>
|
|
<source>FingerprintEnrollDialog</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/biometric-enroll-dialog/fingerprint-enroll-dialog/fingerprint-enroll-dialog.ui" line="70"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_fingerprint-enroll-dialog.h" line="132"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_fingerprint-enroll-dialog.h" line="132"/>
|
|
<source>balabalalbala...</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/biometric-enroll-dialog/fingerprint-enroll-dialog/fingerprint-enroll-dialog.ui" line="131"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_fingerprint-enroll-dialog.h" line="133"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_fingerprint-enroll-dialog.h" line="133"/>
|
|
<source>save</source>
|
|
<translation>保存</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/biometric-enroll-dialog/fingerprint-enroll-dialog/fingerprint-enroll-dialog.ui" line="169"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_fingerprint-enroll-dialog.h" line="134"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_fingerprint-enroll-dialog.h" line="134"/>
|
|
<source>cancel</source>
|
|
<translation>取消</translation>
|
|
</message>
|
|
@@ -500,9 +468,8 @@
|
|
<context>
|
|
<name>HardWorker</name>
|
|
<message>
|
|
- <location filename="../src/hard-worker.cpp" line="46"/>
|
|
<source>Create User failed</source>
|
|
- <translation>创建用户失败</translation>
|
|
+ <translation type="vanished">创建用户失败</translation>
|
|
</message>
|
|
<message>
|
|
<source>password</source>
|
|
@@ -525,17 +492,27 @@
|
|
<translation type="vanished">设置用户属性失败</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/hard-worker.cpp" line="151"/>
|
|
+ <location filename="../src/hard-worker.cpp" line="58"/>
|
|
+ <source>Create User Failed</source>
|
|
+ <translation>创建用户失败</translation>
|
|
+ </message>
|
|
+ <message>
|
|
+ <location filename="../src/hard-worker.cpp" line="148"/>
|
|
+ <source>Unknown Error</source>
|
|
+ <translation>未知错误</translation>
|
|
+ </message>
|
|
+ <message>
|
|
+ <location filename="../src/hard-worker.cpp" line="165"/>
|
|
<source> update password failed</source>
|
|
<translation>更新密码失败</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/hard-worker.cpp" line="177"/>
|
|
+ <location filename="../src/hard-worker.cpp" line="191"/>
|
|
<source>icon file</source>
|
|
<translation>头像</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/hard-worker.cpp" line="188"/>
|
|
+ <location filename="../src/hard-worker.cpp" line="202"/>
|
|
<source>userName type</source>
|
|
<translation>用户名</translation>
|
|
</message>
|
|
@@ -544,12 +521,12 @@
|
|
<translation type="vanished">账户类型</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/hard-worker.cpp" line="199"/>
|
|
+ <location filename="../src/hard-worker.cpp" line="213"/>
|
|
<source>locked</source>
|
|
<translation>启用状态</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/hard-worker.cpp" line="207"/>
|
|
+ <location filename="../src/hard-worker.cpp" line="221"/>
|
|
<source>Failed to update user properties,%1</source>
|
|
<translation>更新用户属性失败，%1</translation>
|
|
</message>
|
|
@@ -558,7 +535,7 @@
|
|
<translation type="vanished">更新用户属性失败(%1)</translation>
|
|
</message>
|
|
<message>
|
|
- <location filename="../src/hard-worker.cpp" line="230"/>
|
|
+ <location filename="../src/hard-worker.cpp" line="244"/>
|
|
<source>Failed to delete user,%1</source>
|
|
<translation>删除用户失败，%1</translation>
|
|
</message>
|
|
@@ -618,7 +595,6 @@
|
|
<message>
|
|
<location filename="../src/widgets/kiran-tips.ui" line="29"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_kiran-tips.h" line="71"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_kiran-tips.h" line="71"/>
|
|
<source>Form</source>
|
|
<translation></translation>
|
|
</message>
|
|
@@ -628,70 +604,60 @@
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="247"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="247"/>
|
|
<source>PasswordExpirationPolicyPage</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="43"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="248"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="248"/>
|
|
<source>User expires</source>
|
|
<translation>用户过期时间</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="67"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="249"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="249"/>
|
|
<source>yyyy-MM-dd</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="84"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="250"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="250"/>
|
|
<source>Last password change</source>
|
|
<translation>最近一次密码修改时间</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="108"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="251"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="251"/>
|
|
<source>1990-01-01</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="125"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="252"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="252"/>
|
|
<source>Maximum vaild days of password</source>
|
|
<translation>密码最大有限天数</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="162"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="253"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="253"/>
|
|
<source>Prompt time before password expiration</source>
|
|
<translation>密码过期之前提醒的天数</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="199"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="254"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="254"/>
|
|
<source>how many days after password expires will become inactive</source>
|
|
<translation>密码过期多少天认定为失效</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="277"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="255"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="255"/>
|
|
<source>save</source>
|
|
<translation>保存</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/passwd-expiration-policy/password-expiration-policy-page.ui" line="318"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="256"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_password-expiration-policy-page.h" line="256"/>
|
|
<source>return</source>
|
|
<translation>返回</translation>
|
|
</message>
|
|
@@ -731,35 +697,30 @@
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="14"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="520"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="520"/>
|
|
<source>Form</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="157"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="521"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="521"/>
|
|
<source>Account</source>
|
|
<translation></translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="203"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="522"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="522"/>
|
|
<source>Change password</source>
|
|
<translation>修改密码</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="462"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="527"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="527"/>
|
|
<source>Password expiration policy</source>
|
|
<translation>密码过期策略</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="233"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="523"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="523"/>
|
|
<source>User id</source>
|
|
<translation>用户ID</translation>
|
|
</message>
|
|
@@ -774,70 +735,60 @@
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="292"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="524"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="524"/>
|
|
<source>User type</source>
|
|
<translation>用户类型</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="354"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="525"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="525"/>
|
|
<source>User status</source>
|
|
<translation>启用用户</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="416"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="526"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="526"/>
|
|
<source>auth manager</source>
|
|
<translation>认证管理</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="523"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="528"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="528"/>
|
|
<source>Confirm</source>
|
|
<translation>保存</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="564"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="529"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="529"/>
|
|
<source>Delete</source>
|
|
<translation>删除用户</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="623"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="530"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="530"/>
|
|
<source>Current password</source>
|
|
<translation>当前密码</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="684"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="531"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="531"/>
|
|
<source>New password</source>
|
|
<translation>新密码</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="733"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="532"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="532"/>
|
|
<source>Enter the new password again</source>
|
|
<translation>再次输入新密码</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="826"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="533"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="533"/>
|
|
<source>Save</source>
|
|
<translation>保存</translation>
|
|
</message>
|
|
<message>
|
|
<location filename="../src/pages/user-info-page/user-info-page.ui" line="867"/>
|
|
<location filename="../build/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="534"/>
|
|
- <location filename="../cmake-build-debug/kiran-cpanel-account_autogen/include/ui_user-info-page.h" line="534"/>
|
|
<source>Cancel</source>
|
|
<translation>取消</translation>
|
|
</message>
|
|
--
|
|
2.27.0
|
|
|