From f458add1471e7957f6363e531d82d878fa094b92 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 13 Jul 2021 15:58:06 +1000 Subject: [PATCH] add note about display order using current deck --- ftl/core/deck-config.ftl | 3 +++ ts/deck-options/DisplayOrder.svelte | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ftl/core/deck-config.ftl b/ftl/core/deck-config.ftl index 5b4551b6b..90e167e23 100644 --- a/ftl/core/deck-config.ftl +++ b/ftl/core/deck-config.ftl @@ -132,6 +132,9 @@ deck-config-sort-order-due-date-then-deck = Due date, then deck deck-config-sort-order-deck-then-due-date = Deck, then due date deck-config-sort-order-ascending-intervals = Ascending intervals deck-config-sort-order-descending-intervals = Descending intervals +deck-config-display-order-will-use-current-deck = + Anki will use the display order from the deck you + select to study, and not any subdecks it may have. ## Timer section diff --git a/ts/deck-options/DisplayOrder.svelte b/ts/deck-options/DisplayOrder.svelte index c158fba1f..7a23e4ca4 100644 --- a/ts/deck-options/DisplayOrder.svelte +++ b/ts/deck-options/DisplayOrder.svelte @@ -17,6 +17,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html let config = state.currentConfig; let defaults = state.defaults; + let currentDeck = "\n\n" + tr.deckConfigDisplayOrderWillUseCurrentDeck(); + const newGatherPriorityChoices = [ tr.deckConfigNewGatherPriorityDeck(), tr.deckConfigNewGatherPriorityPositionLowestFirst(), @@ -45,7 +47,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html bind:value={$config.newCardGatherPriority} defaultValue={defaults.newCardGatherPriority} choices={newGatherPriorityChoices} - markdownTooltip={tr.deckConfigNewGatherPriorityTooltip()} + markdownTooltip={tr.deckConfigNewGatherPriorityTooltip() + currentDeck} > {tr.deckConfigNewGatherPriority()} @@ -56,7 +58,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html bind:value={$config.newCardSortOrder} defaultValue={defaults.newCardSortOrder} choices={newSortOrderChoices} - markdownTooltip={tr.deckConfigNewCardSortOrderTooltip()} + markdownTooltip={tr.deckConfigNewCardSortOrderTooltip() + currentDeck} > {tr.deckConfigNewCardSortOrder()} @@ -67,7 +69,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html bind:value={$config.newMix} defaultValue={defaults.newMix} choices={reviewMixChoices()} - markdownTooltip={tr.deckConfigNewReviewPriorityTooltip()} + markdownTooltip={tr.deckConfigNewReviewPriorityTooltip() + currentDeck} > {tr.deckConfigNewReviewPriority()} @@ -78,7 +80,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html bind:value={$config.interdayLearningMix} defaultValue={defaults.interdayLearningMix} choices={reviewMixChoices()} - markdownTooltip={tr.deckConfigInterdayStepPriorityTooltip()} + markdownTooltip={tr.deckConfigInterdayStepPriorityTooltip() + currentDeck} > {tr.deckConfigInterdayStepPriority()} @@ -89,7 +91,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html bind:value={$config.reviewOrder} defaultValue={defaults.reviewOrder} choices={reviewOrderChoices} - markdownTooltip={tr.deckConfigReviewSortOrderTooltip()} + markdownTooltip={tr.deckConfigReviewSortOrderTooltip() + currentDeck} > {tr.deckConfigReviewSortOrder()}