From a74ee348f737902e3d1f60766e3af2d11733d2ad Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sun, 14 May 2023 10:17:43 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/8242 --- app/appearance/langs/en_US.json | 1 + app/appearance/langs/es_ES.json | 1 + app/appearance/langs/fr_FR.json | 1 + app/appearance/langs/zh_CHT.json | 1 + app/appearance/langs/zh_CN.json | 1 + app/src/config/bazaar.ts | 28 +++++++++++++++------------- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 0edc23949..da37566bb 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "confirmUninstall": "Are you sure you want to uninstall ${name}?", "scrollGetMore": "Don't panic... scroll up and down to load more", "flashcardNewCard": "New", "flashcardReviewCard": "Review", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 8bdcaa5b6..3212321c7 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "confirmUninstall": "¿Está seguro de que desea desinstalar ${name}?", "scrollGetMore": "No se asuste... desplácese hacia arriba y hacia abajo para cargar más", "flashcardNewCard": "Nueva Tarjeta", "flashcardReviewCard": "Revisar Tarjeta", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index d7451f56e..9d231349e 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "confirmUninstall": "Êtes-vous sûr de vouloir désinstaller ${name} ?", "scrollGetMore": "Ne paniquez pas... faites défiler de haut en bas pour en charger plus", "flashcardNewCard": "Nouvelle carte", "flashcardReviewCard": "Revoir la carte", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index c63a4d931..6a21e08a8 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "confirmUninstall": "確定卸載 ${name} ?", "scrollGetMore": "不要驚慌...上下滾動即可加載更多內容", "flashcardNewCard": "新卡", "flashcardReviewCard": "複習卡", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 556883edc..252993cf9 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "confirmUninstall": "确定卸载 ${name} ?", "scrollGetMore": "不要惊慌...上下滚动即可加载更多内容", "flashcardNewCard": "新卡", "flashcardReviewCard": "复习卡", diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts index 262777ee5..b8f682026 100644 --- a/app/src/config/bazaar.ts +++ b/app/src/config/bazaar.ts @@ -564,19 +564,21 @@ export const bazaar = { window.siyuan.config.appearance.icon === packageName) { showMessage(window.siyuan.languages.uninstallTip); } else { - fetchPost(url, { - packageName - }, response => { - this._genMyHTML(bazaarType, app); - bazaar._onBazaar(response, bazaarType, ["themes", "icons"].includes(bazaarType)); - // TODO destroy plugin - if (bazaarType === "plugins") { - exportLayout({ - reload: true, - onlyData: false, - errorExit: false, - }); - } + confirmDialog(window.siyuan.languages.uninstall, window.siyuan.languages.confirmUninstall.replace("${name}", packageName), () => { + fetchPost(url, { + packageName + }, response => { + this._genMyHTML(bazaarType, app); + bazaar._onBazaar(response, bazaarType, ["themes", "icons"].includes(bazaarType)); + if (bazaarType === "plugins") { + // TODO destroy plugin + exportLayout({ + reload: true, + onlyData: false, + errorExit: false, + }); + } + }); }); } event.preventDefault();