From 101a8e7350176a30a477c2e097267ec6e9907d8c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 9 Jun 2022 19:17:15 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=BD=AC=E6=8D=A2=E6=9C=AC=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/5131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- kernel/model/assets.go | 9 +++++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 38ea717a8..24c0ce21b 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -850,7 +850,7 @@ "116": "Processing, please wait...", "117": "[%s] is not a valid Pandoc executable", "118": "The current settings do not allow the creation of sub-documents under a document 7 levels deep", - "119": "Downloading web image...", + "119": "Downloading web image [%s]", "120": "Download complete, [%d] files total", "121": "There is no network image in this document", "122": "This function needs to be configured on SiYuan desktop", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index d282a8091..d557b871e 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -850,7 +850,7 @@ "116": "Traitement en cours, veuillez patienter...", "117": "[%s] n'est pas un exécutable Pandoc valide", "118": "Les paramètres actuels ne permettent pas la création de sous-documents sous un document de 7 niveaux de profondeur", - "119": "Téléchargement de l'image Web...", + "119": "Téléchargement de l'image Web [%s]", "120": "Téléchargement terminé, [%d] fichiers au total", "121": "Il n'y a pas d'image réseau dans ce document", "122": "Cette fonction doit être configurée sur le bureau SiYuan", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 6d0d0fe5c..67717426f 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -850,7 +850,7 @@ "116": "正在處理中，請稍等...", "117": "[%s] 不是有效的 Pandoc 可執行文件", "118": "當前設置不允許在 7 層深度的文檔下創建子文檔", - "119": "正在下載網絡圖片...", + "119": "正在下載網絡圖片 [%s]", "120": "下載完畢，一共 [%d] 個文件", "122": "該功能需在思源桌面端進行配置", "123": "新增/選擇雲端同步目錄後才能啟用同步功能", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 748450772..c2e11a190 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -851,7 +851,7 @@ "116": "正在处理中，请稍等...", "117": "[%s] 不是有效的 Pandoc 可执行文件", "118": "当前设置不允许在 7 层深度的文档下创建子文档", - "119": "正在下载网络图片...", + "119": "正在下载网络图片 [%s]", "120": "下载完毕，一共 [%d] 个文件", "121": "该文档中不存在网络图片", "122": "该功能需在思源桌面端进行配置", diff --git a/kernel/model/assets.go b/kernel/model/assets.go index d29088975..4d20a0eda 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -69,7 +69,7 @@ func NetImg2LocalAssets(rootID string) (err error) { } var files int - util.PushMsg(Conf.Language(119), 7000) + msgId := gulu.Rand.String(7) ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus { if !entering { return ast.WalkContinue @@ -90,6 +90,7 @@ func NetImg2LocalAssets(rootID string) (err error) { u = strings.Replace(u, "/0?", "/640?", 1) } } + util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(119), u), 15000) request := util.NewBrowserRequest(Conf.System.NetworkProxy.String()) resp, reqErr := request.Get(u) if nil != reqErr { @@ -147,14 +148,14 @@ func NetImg2LocalAssets(rootID string) (err error) { return ast.WalkContinue }) if 0 < files { - util.PushMsg(Conf.Language(113), 7000) + util.PushUpdateMsg(msgId, Conf.Language(113), 7000) if err = writeJSONQueue(tree); nil != err { return } sql.WaitForWritingDatabase() - util.PushMsg(fmt.Sprintf(Conf.Language(120), files), 5000) + util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(120), files), 5000) } else { - util.PushMsg(Conf.Language(121), 3000) + util.PushUpdateMsg(msgId, Conf.Language(121), 3000) } return }