!18 update desktop and add sdk translate
From: @jackssir Reviewed-by: @dou33 Signed-off-by: @dou33
This commit is contained in:
commit
65da7ee01f
72
0001-update-desktop-file-and-add-sdk-translate.patch
Normal file
72
0001-update-desktop-file-and-add-sdk-translate.patch
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
From f29558cc9b85835f8a3d4cbbab52809528a7766e Mon Sep 17 00:00:00 2001
|
||||||
|
From: lvfei <lvfei@kylinos.cn>
|
||||||
|
Date: Tue, 27 Sep 2022 15:35:26 +0800
|
||||||
|
Subject: [PATCH] update desktop file and add sdk translate
|
||||||
|
|
||||||
|
---
|
||||||
|
kylin-calculator.desktop | 3 +++
|
||||||
|
main.cpp | 22 ++++++++++++++++------
|
||||||
|
2 files changed, 19 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/kylin-calculator.desktop b/kylin-calculator.desktop
|
||||||
|
index 47c91bf..f8b3f5a 100644
|
||||||
|
--- a/kylin-calculator.desktop
|
||||||
|
+++ b/kylin-calculator.desktop
|
||||||
|
@@ -2,8 +2,11 @@
|
||||||
|
Name=Calculator
|
||||||
|
Name[zh_CN]=计算器
|
||||||
|
Name[bo_CN]=རྩིས་ཆས།
|
||||||
|
+Name[zh_HK]=計算器
|
||||||
|
GenericName[bo_CN]=རྩིས་ཆས།
|
||||||
|
GenericName=Calculator
|
||||||
|
+GenericName[zh_CN]=计算器
|
||||||
|
+GenericName[zh_HK]=計算器
|
||||||
|
Keywords=calculator
|
||||||
|
Exec=/usr/bin/kylin-calculator %u
|
||||||
|
Icon=kylin-calculator
|
||||||
|
diff --git a/main.cpp b/main.cpp
|
||||||
|
index 914b56f..5d44560 100644
|
||||||
|
--- a/main.cpp
|
||||||
|
+++ b/main.cpp
|
||||||
|
@@ -117,22 +117,32 @@ int main(int argc, char *argv[])
|
||||||
|
/* 加载翻译文件 */
|
||||||
|
QString tranPath("/usr/share/kylin-calculator/translations/");
|
||||||
|
QString tranQtPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
|
||||||
|
-
|
||||||
|
QTranslator *tran = new QTranslator;
|
||||||
|
QTranslator *tranQt = new QTranslator;
|
||||||
|
-
|
||||||
|
- if (tran->load(QLocale() , QString("kylin-calculator") , QString("_") , tranPath)) {
|
||||||
|
+ if (tran->load(QLocale(), QString("kylin-calculator"), QString("_"), tranPath)) {
|
||||||
|
QApplication::installTranslator(tran);
|
||||||
|
} else {
|
||||||
|
qDebug() << "Waring : load translation file fail";
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- if (tranQt->load(QLocale() , QString("qt") , QString("_") , tranQtPath)) {
|
||||||
|
+ if (tranQt->load(QLocale(), QString("qt"), QString("_"), tranQtPath)) {
|
||||||
|
QApplication::installTranslator(tranQt);
|
||||||
|
} else {
|
||||||
|
- qDebug() << "Load translations file" << QLocale() << "failed!";
|
||||||
|
+ qDebug() << "Waring : load qt translation file fail";
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // 加载sdk控件翻译
|
||||||
|
+ QTranslator trans;
|
||||||
|
+ QString locale = QLocale::system().name();
|
||||||
|
+ if (locale == "zh_CN") {
|
||||||
|
+ if (trans.load(":/translations/gui_zh_CN.qm")) {
|
||||||
|
+ a.installTranslator(&trans);
|
||||||
|
+ }
|
||||||
|
+ } else if (locale == "bo_CN") {
|
||||||
|
+ if (trans.load(":/translations/gui_bo_CN.qm")) {
|
||||||
|
+ a.installTranslator(&trans);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* 实例 */
|
||||||
|
LogicCenter::getInstance();
|
||||||
|
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -1,12 +1,13 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
Name: kylin-calculator
|
Name: kylin-calculator
|
||||||
Version: 1.0.34
|
Version: 1.0.34
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Calculator tool for UKUI
|
Summary: Calculator tool for UKUI
|
||||||
License: LGPL-3.0-or-later and GPL-3.0-or-later
|
License: LGPL-3.0-or-later and GPL-3.0-or-later
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch01: 0001-add-and-update-some-zangwen-translate.patch
|
Patch01: 0001-add-and-update-some-zangwen-translate.patch
|
||||||
|
Patch02: 0001-update-desktop-file-and-add-sdk-translate.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
BuildRequires: qtchooser
|
BuildRequires: qtchooser
|
||||||
@ -31,6 +32,7 @@ BuildRequires: qt5-linguist
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch01 -p1
|
%patch01 -p1
|
||||||
|
%patch02 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro
|
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro
|
||||||
@ -67,6 +69,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/kylin-calculator/translations/kylin-calculator_bo_CN.qm
|
%{_datadir}/kylin-calculator/translations/kylin-calculator_bo_CN.qm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 27 2022 lvfei <lvfei@kylinos.cn> - 1.0.34-4
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: add patch:0001-update-desktop-file-and-add-sdk-translate.patch
|
||||||
|
|
||||||
* Fri Sep 9 2022 lvfei <lvfei@kylinos.cn> - 1.0.34-3
|
* Fri Sep 9 2022 lvfei <lvfei@kylinos.cn> - 1.0.34-3
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:
|
- CVE:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user