From eb91448934993febb2c51194aaee32dd3a64c44d Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 8 May 2023 22:25:58 +0800 Subject: [PATCH 1/4] :memo: Update v2.8.7 changelogs --- app/changelogs/v2.8.7.md | 1 + app/changelogs/v2.8.7_zh_CN.md | 1 + 2 files changed, 2 insertions(+) diff --git a/app/changelogs/v2.8.7.md b/app/changelogs/v2.8.7.md index 89d573781..be052f79a 100644 --- a/app/changelogs/v2.8.7.md +++ b/app/changelogs/v2.8.7.md @@ -85,6 +85,7 @@ Below are the detailed changelogs. * [Improve hyperlink anchor text when exporting to Markdown](https://github.com/siyuan-note/siyuan/issues/8191) * [Access to the OpenAI API is no longer supported on Huawei devices](https://github.com/siyuan-note/siyuan/issues/8192) * [Check for duplicates in all windows when opening a tab](https://github.com/siyuan-note/siyuan/issues/8193) +* [Update feedback icon](https://github.com/siyuan-note/siyuan/issues/8201) ### Bugfix diff --git a/app/changelogs/v2.8.7_zh_CN.md b/app/changelogs/v2.8.7_zh_CN.md index 3ee9e555f..94f7c7400 100644 --- a/app/changelogs/v2.8.7_zh_CN.md +++ b/app/changelogs/v2.8.7_zh_CN.md @@ -85,6 +85,7 @@ * [改进导出 Markdown 超链接锚文本](https://github.com/siyuan-note/siyuan/issues/8191) * [在华为手机上不再支持配置 OpenAI](https://github.com/siyuan-note/siyuan/issues/8192) * [打开页签时在所有窗口中检查是否重复打开](https://github.com/siyuan-note/siyuan/issues/8193) +* [更新反馈图标](https://github.com/siyuan-note/siyuan/issues/8201) ### 修复缺陷 From b3e85eb567b30ff4dc1de6190e29db81205e5a23 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 9 May 2023 09:12:29 +0800 Subject: [PATCH 2/4] :art: Bazaar i18n --- app/src/config/bazaar.ts | 2 +- app/src/types/index.d.ts | 2 +- kernel/bazaar/icon.go | 7 ++++--- kernel/bazaar/package.go | 3 +-- kernel/bazaar/plugin.go | 8 +++++--- kernel/bazaar/template.go | 8 +++++--- kernel/bazaar/theme.go | 8 +++++--- kernel/bazaar/widget.go | 8 +++++--- 8 files changed, 27 insertions(+), 19 deletions(-) diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts index 1b8e0d63d..b5c77f9c1 100644 --- a/app/src/config/bazaar.ts +++ b/app/src/config/bazaar.ts @@ -397,7 +397,7 @@ export const bazaar = { `; if (dataObj.downloaded) { const mdElement = readmeElement.querySelector(".item__readme"); - mdElement.innerHTML = data.readme; + mdElement.innerHTML = data.preferredReadme; highlightRender(mdElement); } else { fetchPost("/api/bazaar/getBazaarPackageREAME", { diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index b90f74263..7e72f1012 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -709,8 +709,8 @@ declare interface IBazaarItem { enabled: boolean preferredName: string preferredDesc: string + preferredReadme: string iconURL: string - readme: string stars: string author: string updated: string diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go index 4e0797dd4..5ba18a1c4 100644 --- a/kernel/bazaar/icon.go +++ b/kernel/bazaar/icon.go @@ -142,13 +142,14 @@ func InstalledIcons() (ret []*Icon) { installSize, _ := util.SizeOfDirectory(installPath) icon.InstallSize = installSize icon.HInstallSize = humanize.Bytes(uint64(installSize)) - readme, readErr := os.ReadFile(filepath.Join(installPath, "README.md")) + readmeFilename := getPreferredReadme(icon.Readme) + readme, readErr := os.ReadFile(filepath.Join(installPath, readmeFilename)) if nil != readErr { - logging.LogWarnf("read install icon README.md failed: %s", readErr) + logging.LogWarnf("read installed README.md failed: %s", readErr) continue } - icon.README, _ = renderREADME(icon.URL, readme) + icon.PreferredReadme, _ = renderREADME(icon.URL, readme) icon.Outdated = isOutdatedIcon(icon, bazaarIcons) ret = append(ret, icon) } diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index 30f23ae9f..1cae7d85a 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -76,6 +76,7 @@ type Package struct { PreferredFunding string `json:"preferredFunding"` PreferredName string `json:"preferredName"` PreferredDesc string `json:"preferredDesc"` + PreferredReadme string `json:"preferredReadme"` Name string `json:"name"` RepoURL string `json:"repoURL"` @@ -84,8 +85,6 @@ type Package struct { PreviewURLThumb string `json:"previewURLThumb"` IconURL string `json:"iconURL"` - README string `json:"readme"` - Installed bool `json:"installed"` Outdated bool `json:"outdated"` Current bool `json:"current"` diff --git a/kernel/bazaar/plugin.go b/kernel/bazaar/plugin.go index ac9fba740..791edc8e9 100644 --- a/kernel/bazaar/plugin.go +++ b/kernel/bazaar/plugin.go @@ -148,12 +148,14 @@ func InstalledPlugins() (ret []*Plugin) { installSize, _ := util.SizeOfDirectory(installPath) plugin.InstallSize = installSize plugin.HInstallSize = humanize.Bytes(uint64(installSize)) - readme, readErr := os.ReadFile(filepath.Join(installPath, "README.md")) + readmeFilename := getPreferredReadme(plugin.Readme) + readme, readErr := os.ReadFile(filepath.Join(installPath, readmeFilename)) if nil != readErr { - logging.LogWarnf("read install plugin README.md failed: %s", readErr) + logging.LogWarnf("read installed README.md failed: %s", readErr) continue } - plugin.README, _ = renderREADME(plugin.URL, readme) + + plugin.PreferredReadme, _ = renderREADME(plugin.URL, readme) plugin.Outdated = isOutdatedPlugin(plugin, bazaarPlugins) ret = append(ret, plugin) } diff --git a/kernel/bazaar/template.go b/kernel/bazaar/template.go index 4b7595a46..3e5c4859d 100644 --- a/kernel/bazaar/template.go +++ b/kernel/bazaar/template.go @@ -149,12 +149,14 @@ func InstalledTemplates() (ret []*Template) { installSize, _ := util.SizeOfDirectory(installPath) template.InstallSize = installSize template.HInstallSize = humanize.Bytes(uint64(installSize)) - readme, readErr := os.ReadFile(filepath.Join(installPath, "README.md")) + readmeFilename := getPreferredReadme(template.Readme) + readme, readErr := os.ReadFile(filepath.Join(installPath, readmeFilename)) if nil != readErr { - logging.LogWarnf("read install template README.md failed: %s", readErr) + logging.LogWarnf("read installed README.md failed: %s", readErr) continue } - template.README, _ = renderREADME(template.URL, readme) + + template.PreferredReadme, _ = renderREADME(template.URL, readme) template.Outdated = isOutdatedTemplate(template, bazaarTemplates) ret = append(ret, template) } diff --git a/kernel/bazaar/theme.go b/kernel/bazaar/theme.go index b30a024c9..ca37c26ea 100644 --- a/kernel/bazaar/theme.go +++ b/kernel/bazaar/theme.go @@ -150,12 +150,14 @@ func InstalledThemes() (ret []*Theme) { installSize, _ := util.SizeOfDirectory(installPath) theme.InstallSize = installSize theme.HInstallSize = humanize.Bytes(uint64(installSize)) - readme, readErr := os.ReadFile(filepath.Join(installPath, "README.md")) + readmeFilename := getPreferredReadme(theme.Readme) + readme, readErr := os.ReadFile(filepath.Join(installPath, readmeFilename)) if nil != readErr { - logging.LogWarnf("read install theme README.md failed: %s", readErr) + logging.LogWarnf("read installed README.md failed: %s", readErr) continue } - theme.README, _ = renderREADME(theme.URL, readme) + + theme.PreferredReadme, _ = renderREADME(theme.URL, readme) theme.Outdated = isOutdatedTheme(theme, bazaarThemes) ret = append(ret, theme) } diff --git a/kernel/bazaar/widget.go b/kernel/bazaar/widget.go index fdd713f1d..138eeb90c 100644 --- a/kernel/bazaar/widget.go +++ b/kernel/bazaar/widget.go @@ -147,12 +147,14 @@ func InstalledWidgets() (ret []*Widget) { installSize, _ := util.SizeOfDirectory(installPath) widget.InstallSize = installSize widget.HInstallSize = humanize.Bytes(uint64(installSize)) - readme, readErr := os.ReadFile(filepath.Join(installPath, "README.md")) + readmeFilename := getPreferredReadme(widget.Readme) + readme, readErr := os.ReadFile(filepath.Join(installPath, readmeFilename)) if nil != readErr { - logging.LogWarnf("read install widget README.md failed: %s", readErr) + logging.LogWarnf("read installed README.md failed: %s", readErr) continue } - widget.README, _ = renderREADME(widget.URL, readme) + + widget.PreferredReadme, _ = renderREADME(widget.URL, readme) widget.Outdated = isOutdatedWidget(widget, bazaarWidgets) ret = append(ret, widget) } From 9fa21f7ce2dae0623a2cbc9bcebc2a2d74cf7ca5 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 9 May 2023 09:37:31 +0800 Subject: [PATCH 3/4] :art: Show count in spaced repetition tree filter floating window https://github.com/siyuan-note/siyuan/issues/8202 --- app/appearance/langs/en_US.json | 3 +++ app/appearance/langs/es_ES.json | 3 +++ app/appearance/langs/fr_FR.json | 3 +++ app/appearance/langs/zh_CHT.json | 3 +++ app/appearance/langs/zh_CN.json | 3 +++ 5 files changed, 15 insertions(+) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index dae4aa859..a670434e4 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,7 @@ { + "flashcardNewCard": "New", + "flashcardReviewCard": "Review", + "flashcardCard": "Total", "plugin": "Plugin", "attrBookmarkTip": "Associate this block with a bookmark for subsequent viewing through the bookmark panel", "attrNameTip": "Set a name for this block, mainly for reference and search, a block can only have one unique name", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index d7fd2ff8e..3d12d2686 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,7 @@ { + "flashcardNewCard": "Nueva Tarjeta", + "flashcardReviewCard": "Revisar Tarjeta", + "flashcardCard": "Todos", "plugin": "Complemento", "attrBookmarkTip": "Asociar este bloque con un marcador para verlo posteriormente a través del panel de marcadores", "attrNameTip": "Establezca un nombre para este bloque, principalmente para referencia y búsqueda, un bloque solo puede tener un nombre único", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 9287b5a9d..9fe582512 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,7 @@ { + "flashcardNewCard": "Nouvelle carte", + "flashcardReviewCard": "Revoir la carte", + "flashcardCard": "Tous", "plugin": "Plugin", "attrBookmarkTip": "Associez ce bloc à un signet pour un affichage ultérieur via le panneau des signets", "attrNameTip": "Définissez un nom pour ce bloc, principalement pour la référence et la recherche, un bloc ne peut avoir qu'un seul nom unique", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index fd70980a9..20f932de5 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,7 @@ { + "flashcardNewCard": "新卡", + "flashcardReviewCard": "複習卡", + "flashcardCard": "所有", "plugin": "插件", "attrBookmarkTip": "將該塊和一個書籤進行關聯，以便後續通過書籤面板查看", "attrNameTip": "為該塊設置命名，主要用於引用和搜索，一個塊只能擁有一個唯一的命名", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 9cd5ca715..f7829b113 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,7 @@ { + "flashcardNewCard": "新卡", + "flashcardReviewCard": "复习卡", + "flashcardCard": "所有", "plugin": "插件", "attrBookmarkTip": "将该块和一个书签进行关联，以便后续通过书签面板查看", "attrNameTip": "为该块设置命名，主要用于引用和搜索，一个块只能拥有一个唯一的命名", From 0488f902942482ee0d4c5de242c79039546a5542 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 9 May 2023 09:39:00 +0800 Subject: [PATCH 4/4] :art: Show count in spaced repetition tree filter floating window https://github.com/siyuan-note/siyuan/issues/8202 --- app/changelogs/v2.8.7.md | 1 + app/changelogs/v2.8.7_zh_CN.md | 1 + 2 files changed, 2 insertions(+) diff --git a/app/changelogs/v2.8.7.md b/app/changelogs/v2.8.7.md index be052f79a..dfdcd8aa7 100644 --- a/app/changelogs/v2.8.7.md +++ b/app/changelogs/v2.8.7.md @@ -86,6 +86,7 @@ Below are the detailed changelogs. * [Access to the OpenAI API is no longer supported on Huawei devices](https://github.com/siyuan-note/siyuan/issues/8192) * [Check for duplicates in all windows when opening a tab](https://github.com/siyuan-note/siyuan/issues/8193) * [Update feedback icon](https://github.com/siyuan-note/siyuan/issues/8201) +* [Show count in spaced repetition tree filter floating window](https://github.com/siyuan-note/siyuan/issues/8202) ### Bugfix diff --git a/app/changelogs/v2.8.7_zh_CN.md b/app/changelogs/v2.8.7_zh_CN.md index 94f7c7400..6ab038cc1 100644 --- a/app/changelogs/v2.8.7_zh_CN.md +++ b/app/changelogs/v2.8.7_zh_CN.md @@ -86,6 +86,7 @@ * [在华为手机上不再支持配置 OpenAI](https://github.com/siyuan-note/siyuan/issues/8192) * [打开页签时在所有窗口中检查是否重复打开](https://github.com/siyuan-note/siyuan/issues/8193) * [更新反馈图标](https://github.com/siyuan-note/siyuan/issues/8201) +* [间隔重复文档树过滤浮窗中显示计数](https://github.com/siyuan-note/siyuan/issues/8202) ### 修复缺陷