From 8157d88038f3e4f6bc920d2c69d95f9227d90ff3 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 11 Dec 2023 13:40:44 +1000 Subject: [PATCH] Invert seconds to show question/answer; tweak wording The previous wording could be interpreted as 'time until showing question' or 'time that question should be shown'. I'd intended the latter, and I didn't notice that the original implementation was doing the former. --- ftl/core/deck-config.ftl | 8 ++++---- qt/aqt/reviewer.py | 8 ++++---- ts/deck-options/TimerOptions.svelte | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ftl/core/deck-config.ftl b/ftl/core/deck-config.ftl index c62117660..88323d5af 100644 --- a/ftl/core/deck-config.ftl +++ b/ftl/core/deck-config.ftl @@ -234,10 +234,10 @@ deck-config-stop-timer-on-answer = Stop timer on answer deck-config-stop-timer-on-answer-tooltip = Whether to stop the timer when the answer is revealed. This doesn't affect statistics. -deck-config-seconds-to-show-question = Seconds to show question -deck-config-seconds-to-show-question-tooltip = The number of seconds to wait before automatically advancing to the next question. Set to 0 to disable. -deck-config-seconds-to-show-answer = Seconds to show answer -deck-config-seconds-to-show-answer-tooltip = The number of seconds to wait before automatically revealing the answer. Set to 0 to disable. +deck-config-seconds-to-show-question = Seconds to show question for +deck-config-seconds-to-show-question-tooltip-2 = When auto advance is activated, the number of seconds to wait before revealing the answer. Set to 0 to disable. +deck-config-seconds-to-show-answer = Seconds to show answer for +deck-config-seconds-to-show-answer-tooltip-2 = When auto advance is activated, the number of seconds to wait before applying the answer action. Set to 0 to disable. deck-config-answer-action = Answer action deck-config-answer-action-tooltip = The action to perform on the current card before automatically advancing to the next one. deck-config-wait-for-audio-tooltip = Wait for audio to finish before automatically revealing answer or next question diff --git a/qt/aqt/reviewer.py b/qt/aqt/reviewer.py index 8af09eb5f..b9f592afe 100644 --- a/qt/aqt/reviewer.py +++ b/qt/aqt/reviewer.py @@ -399,9 +399,9 @@ class Reviewer: self.card.current_deck_id() ) timer = None - if conf["secondsToShowAnswer"]: + if conf["secondsToShowQuestion"]: timer = self._show_answer_timer = self.mw.progress.timer( - int(conf["secondsToShowAnswer"] * 1000), + int(conf["secondsToShowQuestion"] * 1000), lambda: self._on_show_answer_timeout(timer), repeat=False, parent=self.mw, @@ -469,9 +469,9 @@ class Reviewer: self.card.current_deck_id() ) timer = None - if conf["secondsToShowQuestion"]: + if conf["secondsToShowAnswer"]: timer = self._show_question_timer = self.mw.progress.timer( - int(conf["secondsToShowQuestion"] * 1000), + int(conf["secondsToShowAnswer"] * 1000), lambda: self._on_show_question_timeout(timer), repeat=False, parent=self.mw, diff --git a/ts/deck-options/TimerOptions.svelte b/ts/deck-options/TimerOptions.svelte index da730ddbf..78c05a5ae 100644 --- a/ts/deck-options/TimerOptions.svelte +++ b/ts/deck-options/TimerOptions.svelte @@ -48,11 +48,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html }, secondsToShowQuestion: { title: tr.deckConfigSecondsToShowQuestion(), - help: tr.deckConfigSecondsToShowQuestionTooltip(), + help: tr.deckConfigSecondsToShowQuestionTooltip2(), }, secondsToShowAnswer: { title: tr.deckConfigSecondsToShowAnswer(), - help: tr.deckConfigSecondsToShowAnswerTooltip(), + help: tr.deckConfigSecondsToShowAnswerTooltip2(), }, waitForAudio: { title: tr.deckConfigWaitForAudio(),