From 84e0acf9b7c53319b3c95cfc1ff7282cf29c1725 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Mon, 4 Apr 2022 01:50:36 +0200
Subject: [PATCH] Template order (#1769)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Improve new card sort order tooltip

* Use card type instead of template in deck config

* Card type ordinal → card type number
---
 ftl/core/deck-config.ftl | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/ftl/core/deck-config.ftl b/ftl/core/deck-config.ftl
index d10ab8ae3..de342a2ae 100644
--- a/ftl/core/deck-config.ftl
+++ b/ftl/core/deck-config.ftl
@@ -122,28 +122,31 @@ deck-config-new-gather-priority-random-notes = Random notes
 deck-config-new-gather-priority-random-cards = Random cards
 deck-config-new-card-sort-order = New card sort order
 deck-config-new-card-sort-order-tooltip-2 =
-    `Card template`: Displays cards in card template order. If you have sibling burying
-    disabled, this will ensure all front->back cards are seen before any back->front cards.
+    `Card type`: Displays cards in order of card type number. If you have sibling burying
+    disabled, this will ensure all front→back cards are seen before any back→front cards.
+    This is useful to have all cards of the same note shown in the same session, but not
+    too close to one another.
     
     `Order gathered`: Shows cards exactly as they were gathered. If sibling burying is disabled,
     this will typically result in all cards of a note being seen one after the other.
     
-    `Card template, then random`: Like `Card template`, but shuffles the cards of each
-    template. When combined with an ascending position gather order, this can be used to show
-    the oldest cards in a random order for example.
+    `Card type, then random`: Like `Card type`, but shuffles the cards of each card
+    type number. If you use `Ascending position` to gather the oldest cards, you could use
+    this setting to see those cards in a random order, but still ensure cards of the same
+    note do not end up too close to one another.
     
-    `Random note, then card template`: Picks notes at random, then shows all of their siblings
+    `Random note, then card type`: Picks notes at random, then shows all of their siblings
     in order.
     
     `Random`: Fully shuffles the gathered cards.
-deck-config-sort-order-card-template-then-lowest-position = Card template, then ascending position
-deck-config-sort-order-card-template-then-highest-position = Card template, then descending position
-deck-config-sort-order-card-template-then-random = Card template, then random
-deck-config-sort-order-random-note-then-template = Random note, then card template
+deck-config-sort-order-card-template-then-lowest-position = Card type, then ascending position
+deck-config-sort-order-card-template-then-highest-position = Card type, then descending position
+deck-config-sort-order-card-template-then-random = Card type, then random
+deck-config-sort-order-random-note-then-template = Random note, then card type
 deck-config-sort-order-lowest-position = Ascending position
 deck-config-sort-order-highest-position = Descending position
 deck-config-sort-order-random = Random
-deck-config-sort-order-template-then-gather = Card template
+deck-config-sort-order-template-then-gather = Card type
 deck-config-sort-order-gather = Order gathered
 deck-config-new-review-priority = New/review order
 deck-config-new-review-priority-tooltip = When to show new cards in relation to review cards.