diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index cc2a1fca6..4a9ee7474 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,6 @@ { + "continueReview1": "Continue Review", + "continueReview2": "There are still ${count} cards to review, continue?", "whatsNewInSiYuan": "What's New in SiYuan", "returnDesktop": "Press back again to desktop", "enterNew": "Enter to create", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index b1acfd552..94d887c93 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,6 @@ { + "continueReview1": "Continuar revisión", + "continueReview2": "Todavía hay tarjetas ${count} para revisar, ¿continuar?", "whatsNewInSiYuan": "Novedades en SiYuan", "returnDesktop": "Presiona volver de nuevo al escritorio", "enterNew": "Ingresar para crear", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 8bcf8d991..49324f45a 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,6 @@ { + "continueReview1": "Continuer la révision", + "continueReview2": "Il reste encore des fiches ${count} à examiner, continuer ?", "whatsNewInSiYuan": "Quoi de neuf dans SiYuan", "returnDesktop": "Appuyez à nouveau sur le bureau", "enterNew": "Entrez pour créer", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index d42b0bf64..3d5660157 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,6 @@ { + "continueReview1": "繼續複習", + "continueReview2": "還有 ${count} 張卡片待複習,是否繼續?", "whatsNewInSiYuan": "思源筆記最新變化", "returnDesktop": "再按一次返回桌面", "enterNew": "回車創建", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1cf76eea1..11605ecdd 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,6 @@ { + "continueReview1": "继续复习", + "continueReview2": "还有 ${count} 张卡片待复习,是否继续?", "whatsNewInSiYuan": "思源笔记最新变化", "returnDesktop": "再按一次返回桌面", "enterNew": "回车创建", diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index 6685ae23b..075a58343 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -265,12 +265,12 @@ export const openCardByData = (cardsData: { cards: ICard[], unreviewedCount: num deckID: selectElement?.value, notebook: titleElement.getAttribute("data-notebookid"), reviewedCards: blocks - }, (treeCards) => { + }, (result) => { index = 0; - blocks = treeCards.data.cards; + blocks = result.data.cards; if (blocks.length === 0) { - if (treeCards.data.unreviewedCount > 0) { - newRound(countElement, editor, actionElements); + if (result.data.unreviewedCount > 0) { + newRound(countElement, editor, actionElements, result.data.unreviewedCount); } else { allDone(countElement, editor, actionElements); } @@ -361,12 +361,12 @@ const allDone = (countElement: Element, editor: Protyle, actionElements: NodeLis actionElements[1].classList.add("fn__none"); }; -const newRound = (countElement: Element, editor: Protyle, actionElements: NodeListOf) => { +const newRound = (countElement: Element, editor: Protyle, actionElements: NodeListOf, unreviewedCount: number) => { countElement.classList.add("fn__none"); editor.protyle.element.classList.add("fn__none"); const emptyElement = editor.protyle.element.nextElementSibling; - emptyElement.innerHTML = `
🆕
-`; + emptyElement.innerHTML = `
♻️ ${window.siyuan.languages.continueReview2.replace("${count}", unreviewedCount)}
+`; emptyElement.classList.remove("fn__none"); actionElements[0].classList.add("fn__none"); actionElements[1].classList.add("fn__none"); diff --git a/kernel/model/flashcard.go b/kernel/model/flashcard.go index 0113b5bab..45ecb70a1 100644 --- a/kernel/model/flashcard.go +++ b/kernel/model/flashcard.go @@ -320,7 +320,7 @@ func GetNotebookDueFlashcards(boxID string, reviewedCardIDs []string) (ret []*Fl return } - cards, unreviewdCnt := getDeckDueCards(deck, reviewedCardIDs, treeBlockIDs) + cards, unreviewedCnt := getDeckDueCards(deck, reviewedCardIDs, treeBlockIDs) now := time.Now() for _, card := range cards { blockID := card.BlockID() @@ -329,7 +329,7 @@ func GetNotebookDueFlashcards(boxID string, reviewedCardIDs []string) (ret []*Fl if 1 > len(ret) { ret = []*Flashcard{} } - unreviewedCount = unreviewdCnt + unreviewedCount = unreviewedCnt return } @@ -444,6 +444,7 @@ func getAllDueFlashcards(reviewedCardIDs []string) (ret []*Flashcard, unreviewed now := time.Now() for _, deck := range Decks { cards, unreviewedCnt := getDeckDueCards(deck, reviewedCardIDs, nil) + unreviewedCount += unreviewedCnt for _, card := range cards { blockID := card.BlockID() if nil == treenode.GetBlockTree(blockID) { @@ -451,7 +452,6 @@ func getAllDueFlashcards(reviewedCardIDs []string) (ret []*Flashcard, unreviewed } ret = append(ret, newFlashcard(card, blockID, deck.ID, now)) - unreviewedCount += unreviewedCnt } } if 1 > len(ret) {