!46 [sync] PR-45: fix login translation

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0002-fix-login-translation.patch

@@ -0,0 +1,43 @@
+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
+

ukui-greeter.spec

@@ -1,14 +1,14 @@
 %define debug_package %{nil}
 Name:           ukui-greeter
 Version:        3.0.3
-Release:        3
+Release:        4
 Summary:        Lightdm greeter for UKUI
-License:        GPL-2.0
+License:        GPL-2.0-or-later
 URL:            http://www.ukui.org
 Source0:        ukui-greeter-%{version}.tar.gz
 Patch0:         fix-greeter-translation.patch
 Patch1:         0001-Fix-the-display-error-of-mima.patch
-
+Patch2:         0002-fix-login-translation.patch
 BuildRequires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers opencv glib2-devel
 Requires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers
 Requires: lightdm
@@ -31,6 +31,7 @@ A greeter for UKUI desktop environment written by Qt5.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 qmake-qt5
@@ -55,6 +56,9 @@ gzip  -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
 %{_datadir}/xgreeters/ukui-greeter.desktop
 
 %changelog
+* Fri Oct 14 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.3-4
+- fix login translation
+
 * Fri Jul 15 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.3-3
 - Fix the display error of mima