Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/appearance/langs/en_US.json
#	app/appearance/langs/es_ES.json
#	app/appearance/langs/fr_FR.json
#	app/appearance/langs/zh_CHT.json
#	app/appearance/langs/zh_CN.json
#	app/src/config/bazaar.ts
This commit is contained in:
Vanessa 2024-01-31 17:59:23 +08:00
commit 611d47563f
6 changed files with 9 additions and 4 deletions

View file

@ -652,7 +652,7 @@ export const bazaar = {
if (window.siyuan.config.bazaar.petalDisabled) {
confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.enablePluginTip2);
} else {
confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.enablePluginTip, () => {
confirmDialog("💡 " + window.siyuan.languages.enablePlugin, window.siyuan.languages.enablePluginTip, () => {
fetchPost("/api/petal/setPetalEnabled", {
packageName: dataObj.name,
enabled: true,