packages/ukui-greeter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix greeter translation

Browse Source
This commit is contained in:
peijiankang 2023-01-06 14:09:29 +08:00
parent 4cc769f41b
commit 44ed11f283
2 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
0001-fix-greeter-translation.patch Normal file
View File

@ -0,0 +1,57 @@
From 364c3060d2961ae2e5b9ecb6c49f698d59c2b71b Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Fri, 6 Jan 2023 16:23:32 +0800
Subject: [PATCH] fix greeter translation
---
ukui-greeter/greeter/greeterwindow.cpp | 6 +++---
ukui-greeter/greeter/loginwindow.cpp | 2 +-
ukui-greeter/ukui-greeter.pro | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
index 39b192f..2fefa9f 100644
--- a/ukui-greeter/greeter/greeterwindow.cpp
+++ b/ukui-greeter/greeter/greeterwindow.cpp
@@ -783,9 +783,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 5c40442..616b081 100644
--- a/ukui-greeter/greeter/loginwindow.cpp
+++ b/ukui-greeter/greeter/loginwindow.cpp
@@ -708,7 +708,7 @@ void LoginWindow::onShowPrompt(QString text, QLightDM::Greeter::PromptType type)
if (!m_deviceInfo) {
switchLoginOptType(LOGINOPT_TYPE_PASSWORD);
}
- if(text == "Password: "||text == "密码："){
+ if(text == "Password: "||text == "密码： "){
text = tr("Password: ");
m_isPassWdInput = true;
}
diff --git a/ukui-greeter/ukui-greeter.pro b/ukui-greeter/ukui-greeter.pro
index b6c8814..fc12b32 100644
--- a/ukui-greeter/ukui-greeter.pro
+++ b/ukui-greeter/ukui-greeter.pro
@@ -101,7 +101,7 @@ TRANSLATIONS += translations/zh_CN.ts \
translations/tr.ts \
translations/es.ts
-system("lrelease translations/*.ts")
+system("lrelease-qt5 translations/*.ts")
qm_file.files = translations/*.qm
qm_file.path = $${PREFIX}/translations/
--
2.33.0

10
ukui-greeter.spec
View File

@ -1,11 +1,13 @@
%define debug_package %{nil}
Name: ukui-greeter
Version: 3.1.2
Release: 1
Release: 2
Summary: Lightdm greeter for UKUI
License: GPL-2.0-or-later
URL: http://www.ukui.org
Source0: ukui-greeter-%{version}.tar.gz
Patch01: 0001-fix-greeter-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
BuildRequires: gsettings-qt-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
@ -26,10 +28,11 @@ A greeter for UKUI desktop environment written by Qt5.
provided by biometric-authentication service.
%prep
%setup -q
%patch01 -p1
%build
qmake-qt5
make
make -j4
%install
make INSTALL_ROOT=%{buildroot} install
@ -53,6 +56,9 @@ gzip -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
/usr/lib/ukui-greeter/ukui-greeter-nm-start.sh
%changelog
* Fri Jan 6 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-2
- fix greeter translation
* Wed Nov 23 2022 tanyulong <tanyulong@kylinos.cn> - 3.1.2-1
- update upstream version 3.1.2