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

!9 adjust the sequence to make translation file loaded first

Browse Source 
From: @tanyulong2021
Reviewed-by: @pei-jiankang
Signed-off-by: @pei-jiankang
This commit is contained in:
openeuler-ci-bot 2021-11-09 06:35:57 +00:00 committed by Gitee
commit e347d542dd
2 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
0003-adjust-the-sequence-to-make-translation-file-loaded-first.patch Normal file
View File

@ -0,0 +1,61 @@
From 3da5d58af9a10a88e213a0d1ad64984032f3f795 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 17:02:58 +0800
Subject: [PATCH] adjust the sequence to make translation file loaded first
---
tools/main.cpp | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/tools/main.cpp b/tools/main.cpp
index 58459e4..94f9d72 100755
--- a/tools/main.cpp
+++ b/tools/main.cpp
@@ -70,6 +70,19 @@ int main(int argc, char* argv[])
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication a(argc, argv);
+
+ // Load ts files
+ const QString locale = QLocale::system().name();
+ QTranslator translator;
+ qDebug() << "local: " << locale;
+ qDebug() << "path: " << QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager");
+ if (translator.load(locale, QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager"))) {
+ a.installTranslator(&translator);
+ } else {
+ qDebug() << "Load translations file failed!";
+ }
+
+
UkuiPower powermanager(&a);
bool flag = true;
@@ -120,15 +133,15 @@ int main(int argc, char* argv[])
gs->set("win-key-release",true);
// Load ts files
- const QString locale = QLocale::system().name();
- QTranslator translator;
- qDebug() << "local: " << locale;
- qDebug() << "path: " << QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager");
- if (translator.load(locale, QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager"))) {
- a.installTranslator(&translator);
- } else {
- qDebug() << "Load translations file failed!";
- }
+// const QString locale = QLocale::system().name();
+// QTranslator translator;
+// qDebug() << "local: " << locale;
+// qDebug() << "path: " << QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager");
+// if (translator.load(locale, QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager"))) {
+// a.installTranslator(&translator);
+// } else {
+// qDebug() << "Load translations file failed!";
+// }
MainWindow *w = new MainWindow();
--
2.30.0

9
ukui-session-manager.spec
View File

@ -2,7 +2,7 @@
Name: ukui-session-manager
Version: 3.0.2
Release: 3
Release: 4
Summary: Session manager of the UKUI desktop environment
License: LGPL-2.1+ GPL-3+
URL: http://www.ukui.org
@ -24,7 +24,8 @@ Provides: x-session-manager
patch0: 0001-fix-poweroff.patch
patch1: 0002-reset-changelog-and-format.patch
patch2: 0003-adjust-the-sequence-to-make-translation-file-loaded-first.patch
%description
This package contains a session that can be started from a display
manager such as lightdm. It will load all necessary applications for
@ -35,6 +36,7 @@ patch1: 0002-reset-changelog-and-format.patch
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
mkdir cmake-build
@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
#%%{_datadir}/man/man1/ukui-session-tools.1.gz
%changelog
* Mon Nov 1 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-3
- adjust the sequence to make translation file loaded first
* Thu Oct 28 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-3
- reset changelog and format