2.023 correctly display 1013 error message

fffonion · Aug 21, 2021 · 23e5da8 · 23e5da8
1 parent 651440f
commit 23e5da8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/xeHentai/core.py b/xeHentai/core.py
@@ -275,7 +275,7 @@ def _do_task(self, task_guid):
                             mon.vote(tid, 0)),
                         lambda x, tid = tid: (
                             mon.vote(tid, x[0]),
-                            self.logger.warn(i18n.XEH_SCAN_FAILED % (tid, x[1], x[0])),
+                            self.logger.warn(i18n.XEH_SCAN_FAILED % (tid, x[1], i18n.c(x[0]))),
                         ),
                         mon.wrk_keepalive,
                         util.get_proxy_policy(task.config),

diff --git a/xeHentai/i18n/en_us.py b/xeHentai/i18n/en_us.py
@@ -13,6 +13,7 @@
     ERR_CONNECTION_ERROR: "a connection problem occurs",
     ERR_IP_BANNED: "IP has been banned, retry in %s",
     ERR_IMAGE_BROKEN: "downloaded image is broken",
+    ERR_SCAN_REGEX_FAILED: "page parsing failed",
     ERR_QUOTA_EXCEEDED: "quota exceeded",
     ERR_TASK_NOT_FOUND: "no such task guid",
     ERR_TASK_LEVEL_UNDEF: "task filter level unknown",
@@ -118,7 +119,7 @@
 XEH_FILE_DOWNLOADED = "file downloaded by thread-{} #{} {}"
 XEH_RENAME_HAS_ERRORS = "some files are not renamed:\n%s"
 XEH_DOWNLOAD_HAS_ERROR = "thread-%s retry #%s because of error: %s"
-XEH_SCAN_FAILED = "%s scan page #%s failed: %d"
+XEH_SCAN_FAILED = "%s scan page %s failed: %d"
 
 RPC_STARTED = "RPC server listening on %s:%d"
 RPC_TOO_OPEN = "RPC server is listening on public interface (%s) but no rpc_secret defined, which is not safe"

diff --git a/xeHentai/i18n/zh_hans.py b/xeHentai/i18n/zh_hans.py
@@ -13,6 +13,7 @@
     ERR_CONNECTION_ERROR: "连接有问题？",
     ERR_IP_BANNED: "IP被ban了, 恢复时间: %s",
     ERR_IMAGE_BROKEN: "下载的图片有猫饼",
+    ERR_SCAN_REGEX_FAILED: "网页解析失败",
     ERR_QUOTA_EXCEEDED: "配额超限",
     ERR_TASK_NOT_FOUND: "没有该GUID对应的任务",
     ERR_TASK_LEVEL_UNDEF: "任务过滤等级不存在",

diff --git a/xeHentai/i18n/zh_hant.py b/xeHentai/i18n/zh_hant.py
@@ -13,6 +13,7 @@
     ERR_CONNECTION_ERROR: "連接有問題？",
     ERR_IP_BANNED: "IP被ban了, 恢復時間: %s",
     ERR_IMAGE_BROKEN: "下載的圖片有貓餅",
+    ERR_SCAN_REGEX_FAILED: "網頁解析失敗",
     ERR_QUOTA_EXCEEDED: "配額超限",
     ERR_TASK_NOT_FOUND: "沒有該GUID對應的任務",
     ERR_TASK_LEVEL_UNDEF: "任務過濾等級不存在",