!39 update translations text

From: @tanyulong2021 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2022-07-29 02:53:06 +00:00 committed by Gitee
commit 972d14f8e4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From ff8effd347fae295a7d1169048232c4828e59025 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Fri, 29 Jul 2022 09:43:36 +0800
Subject: [PATCH] update translations text
---
ukui-greeter/greeter/greeterwindow.cpp | 2 +-
ukui-greeter/greeter/language.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
index 76e6953..15cbacc 100644
--- a/ukui-greeter/greeter/greeterwindow.cpp
+++ b/ukui-greeter/greeter/greeterwindow.cpp
@@ -663,7 +663,7 @@ void GreeterWindow::onLanguageChanged(const Language &language)
m_greeter->setLang(language.code);
- m_languageLB->setText(language.name);
+ m_languageLB->setText(getLanguage(language.code).name);
const QFont &font = m_languageLB->font();
QFontMetrics fm(font);
diff --git a/ukui-greeter/greeter/language.cpp b/ukui-greeter/greeter/language.cpp
index 9d55b7f..13ff40f 100644
--- a/ukui-greeter/greeter/language.cpp
+++ b/ukui-greeter/greeter/language.cpp
@@ -107,7 +107,7 @@ LanguagesVector& getLanguages()
{
static LanguagesVector languagesVector;
if(!languagesVector.isEmpty())
- return languagesVector;
+ languagesVector.clear();
QProcess process;
QString command = "/usr/share/language-tools/language-options";
--
2.33.0

View File

@ -1,13 +1,14 @@
%define debug_package %{nil}
Name: ukui-greeter
Version: 3.0.1
Release: 12
Release: 13
Summary: Lightdm greeter for UKUI
License: GPL-2.0-or-later
URL: http://www.ukui.org
Source0: ukui-greeter-%{version}.tar.gz
Patch1: 0001-Fix-the-display-error-of-mima.patch
Patch2: 0002-solve-the-incomplete-display-of-pam-authentication-message.patch
Patch3: 0003-update-translations-text.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
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
@ -30,6 +31,7 @@ A greeter for UKUI desktop environment written by Qt5.
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
qmake-qt5
@ -54,6 +56,9 @@ gzip -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
%{_datadir}/xgreeters/ukui-greeter.desktop
%changelog
* Fri Jul 29 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-13
- update translations text
* Thu Jul 28 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-12
- solve the incomplete display of pam authentication message