From 39ae7e6f968f7864f5027652196262f1ab997ac7 Mon Sep 17 00:00:00 2001 From: lilydjwg Date: Thu, 18 Jul 2024 21:54:51 +0800 Subject: [PATCH] fix a missing space in en translation --- lilac2/l10n/en/mail.ftl | 2 +- lilac2/l10n/zh_CN/mail.ftl | 5 +++-- lilac2/repo.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lilac2/l10n/en/mail.ftl b/lilac2/l10n/en/mail.ftl index 0678cfe..7dae8f2 100644 --- a/lilac2/l10n/en/mail.ftl +++ b/lilac2/l10n/en/mail.ftl @@ -49,7 +49,7 @@ packaging-error-aur-subject = Error retrieving AUR package packaging-error-aur = Failed to retrieve AUR package! packaging-error-timeout-subject = Timeout when packaging %s packaging-error-unknown-subject = Unknown error when packaging %s -packaging-error-unknown = An unknown error happened! +packaging-error-unknown = An unknown error happened! Traceback: packaging-log = Packaging log: lilac-yaml-loadding-error = Failed to load lilac.yaml for %s diff --git a/lilac2/l10n/zh_CN/mail.ftl b/lilac2/l10n/zh_CN/mail.ftl index ea8b20e..eada758 100644 --- a/lilac2/l10n/zh_CN/mail.ftl +++ b/lilac2/l10n/zh_CN/mail.ftl @@ -26,18 +26,19 @@ unsupported-maintainer-info = 不支持的格式:{ $info } maintainers-error-subject = { $pkg } 的 maintainers 信息有误 maintainers-error-body = 以下 maintainers 信息有误,请修正。 +-traceback-follows = 调用栈如下: packaging-error-subprocess-subject = 在打包软件包 %s 时发生错误 packaging-error-subprocess = 命令执行失败! 命令 { $cmd } 返回了错误号 { $returncode }。 packaging-error-subprocess-output = 命令的输出如下: -packaging-error-traceback = 调用栈如下: +packaging-error-traceback = { -traceback-follows } packaging-error-aur-subject = 在获取AUR包 %s 时发生错误 packaging-error-aur = 获取AUR包失败! packaging-error-timeout-subject = 打包软件包 %s 超时 packaging-error-unknown-subject = 在打包软件包 %s 时发生未知错误 -packaging-error-unknown = 发生未知错误! +packaging-error-unknown = 发生未知错误!{ -traceback-follows } packaging-log = 打包日志: lilac-yaml-loadding-error = 为软件包 %s 载入 lilac.yaml 时失败 diff --git a/lilac2/repo.py b/lilac2/repo.py index 6cf2e2e..351035f 100644 --- a/lilac2/repo.py +++ b/lilac2/repo.py @@ -295,7 +295,7 @@ def send_error_report( subject_real = subject or l10n.format_value('packaging-error-timeout-subject') else: subject_real = subject or l10n.format_value('packaging-error-unknown-subject') - msg1 = l10n.format_value('packaging-error-unknown') + l10n.format_value('packaging-error-traceback') + msg1 = l10n.format_value('packaging-error-unknown') msgs.append(msg1 + '\n\n' + tb) else: if subject is None: