From 17b02fa6f84bfad255adf54409c3a0b98d47aaaa Mon Sep 17 00:00:00 2001 From: luoxueyi Date: Fri, 19 Aug 2022 16:17:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=AD=E6=96=87=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=85=A8?= =?UTF-8?q?=E7=9B=98=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/SystemUpdater/Core/Database.py | 14 ++++++++++++-- backend/po/zh_CN.po | 5 ++++- debian/changelog | 9 +++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/backend/SystemUpdater/Core/Database.py b/backend/SystemUpdater/Core/Database.py index ababed9..7c4bf52 100644 --- a/backend/SystemUpdater/Core/Database.py +++ b/backend/SystemUpdater/Core/Database.py @@ -378,8 +378,8 @@ class Sqlite3Server(object): self._refresh_system_version(str(pkgversion)) elif mode == InstallBackend.MODE_INSTALL_SYSTEM: # 全盘升级 - self.insert_into_updateinfo(str("Upgrade System"), "", "This is a complete system upgrade, equivalent to the implementation of apt dist-upgrade", timestr, status, "1", errstr, str("全盘升级"), status_cn, " ") - self.window_main.dbusController.UpdateSqlitSingle(str("Upgrade System"), timestr) + self.insert_into_updateinfo(_("Upgrade System"), "", "This is a complete system upgrade, equivalent to the implementation of apt dist-upgrade", timestr, status, "1", errstr, str("全盘升级"), status_cn, " ") + self.window_main.dbusController.UpdateSqlitSingle("Upgrade System", timestr) # 全盘更新完成 ..判断版本号 if status == "success": # 更新版本号 @@ -578,6 +578,16 @@ class Sqlite3Server(object): and "appname_cn" in upgrade_info.keys() \ and "status_cn" in upgrade_info.keys() \ and "changelog" in upgrade_info.keys(): + appname = upgrade_info["appname"] + if "(" in appname and ")" in appname: + appname_orig = appname.split("(")[0] + appname_suffix = "("+appname.split("(")[1] + if appname_orig in self.window_main.cache: + pkg = self.window_main.cache[appname_orig] + if pkg.is_installed: + upgrade_info["description"] = pkg.installed.description + upgrade_info["appname"] = self.get_cn_appname(appname_orig)+appname_suffix + upgrade_info["status_cn"] = self.get_cn_appname(appname_orig) self.insert_into_updateinfo( upgrade_info["appname"], upgrade_info["version"], \ upgrade_info["description"], \ upgrade_info["date"], \ diff --git a/backend/po/zh_CN.po b/backend/po/zh_CN.po index 76e6e14..5f8cbaf 100644 --- a/backend/po/zh_CN.po +++ b/backend/po/zh_CN.po @@ -2745,4 +2745,7 @@ msgstr "软件包格式异常，读取失败。" #: ../SystemUpdater/Core/enums.py:102 msgid "Install deb error." -msgstr "安装软件包失败。" \ No newline at end of file +msgstr "安装软件包失败。" + +msgid "Upgrade System" +msgstr "全盘升级" diff --git a/debian/changelog b/debian/changelog index 3f5615b..5f2b4b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +kylin-system-updater (2.0.5.5.1) v101; urgency=medium + + * BUG: #120948 【在线更新】断网时检测更新失败的文案何设计图不符 + * 需求号: # 无 + * 其他改动说明: 无 + * 其他改动影响域:系统更新 + + -- luoxueyi Thu, 04 Aug 2022 09:28:58 +0800 + kylin-system-updater (2.0.5.5) v101; urgency=medium * BUG: #120948 【在线更新】断网时检测更新失败的文案何设计图不符