44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From fac3ce84dbfa94bf9656dce9a95dac65dd99e0bc Mon Sep 17 00:00:00 2001
|
|
From: peijiankang <peijiankang@kylinos.cn>
|
|
Date: Fri, 14 Oct 2022 13:49:20 +0800
|
|
Subject: [PATCH] fix login translation
|
|
|
|
---
|
|
ukui-greeter/greeter/greeterwindow.cpp | 6 +++---
|
|
ukui-greeter/greeter/loginwindow.cpp | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
|
|
index c22fca2..64683d2 100644
|
|
--- a/ukui-greeter/greeter/greeterwindow.cpp
|
|
+++ b/ukui-greeter/greeter/greeterwindow.cpp
|
|
@@ -571,9 +571,9 @@ void GreeterWindow::updateLanguage(QString userName)
|
|
qWarning() << "Get User's language error" << languageReply.error();
|
|
else {
|
|
language = languageReply.value().variant().toString();
|
|
- if(!language.isEmpty()){
|
|
- onLanguageChanged(language);
|
|
- }
|
|
+ if(language.isEmpty())
|
|
+ language = QLocale::system().name();
|
|
+ onLanguageChanged(language);
|
|
}
|
|
|
|
QDBusReply<QDBusVariant> fomatsLocalReply = userIface.call("Get", "org.freedesktop.Accounts.User", "FormatsLocale");
|
|
diff --git a/ukui-greeter/greeter/loginwindow.cpp b/ukui-greeter/greeter/loginwindow.cpp
|
|
index ede06fa..b857bf9 100644
|
|
--- a/ukui-greeter/greeter/loginwindow.cpp
|
|
+++ b/ukui-greeter/greeter/loginwindow.cpp
|
|
@@ -542,7 +542,7 @@ void LoginWindow::onShowPrompt(QString text, QLightDM::Greeter::PromptType type)
|
|
}
|
|
text = tr("Password: ");
|
|
}
|
|
- if(text == "login:") {
|
|
+ if(text == "login:" || text == "登录：") {
|
|
text = tr("Username");
|
|
m_name = "*login";
|
|
//m_nameLabel->setText(tr("login"));
|
|
--
|
|
2.36.1
|
|
|