GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-22 16:02:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'main' into break_answer_buttons_table_x_axis_in_two_rows

Browse source
This commit is contained in:
GithubAnon0000 2025-04-30 12:55:27 +00:00 committed by GitHub
commit 0f696b2cfa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CONTRIBUTORS
View file

@ -224,6 +224,7 @@ rreemmii-dev <https://github.com/rreemmii-dev>
babofitos <https://github.com/babofitos>
Jonathan Schoreels <https://github.com/JSchoreels>
JL710
Matt Brubeck <mbrubeck@limpet.net>
********************

2
ftl/core/deck-config.ftl
View file

@ -484,7 +484,7 @@ deck-config-percent-input = { $pct }%
deck-config-optimizing-preset = Optimizing preset { $current_count }/{ $total_count }...
deck-config-fsrs-must-be-enabled = FSRS must be enabled first.
deck-config-fsrs-params-optimal = The FSRS parameters currently appear to be optimal.
deck-config-fsrs-params-no-reviews = No reviews found. Please check that this preset is assigned to all decks you want to optimize (including subdecks) and try again.
deck-config-fsrs-params-no-reviews = No reviews found. Make sure this preset is assigned to all decks (including subdecks) that you want to optimize, and try again.
deck-config-wait-for-audio = Wait for audio
deck-config-show-reminder = Show Reminder

2
rslib/src/scheduler/answering/current.rs
View file

@ -71,7 +71,7 @@ impl CardStateUpdater {
// Decrease reps by 1 to get correct seed for fuzz.
// If the fuzz calculation changes, this will break.
let last_ivl_with_fuzz = self.learning_ivl_with_fuzz(
get_fuzz_seed_for_id_and_reps(self.card.id, self.card.reps - 1),
get_fuzz_seed_for_id_and_reps(self.card.id, self.card.reps.wrapping_sub(1)),
last_ivl,
);
let last_answered_time = due as i64 - last_ivl_with_fuzz as i64;

6
rslib/src/scheduler/fsrs/params.rs
View file

@ -322,8 +322,6 @@ pub(crate) fn reviews_for_fsrs(
if user_graded && entry.review_kind == RevlogReviewKind::Learning {
first_of_last_learn_entries = Some(index);
revlogs_complete = true;
} else if first_of_last_learn_entries.is_some() {
break;
} else if matches!(
(entry.review_kind, entry.ease_factor),
(RevlogReviewKind::Manual, 0)
@ -343,6 +341,10 @@ pub(crate) fn reviews_for_fsrs(
} else {
return None;
}
// Previous versions of Anki didn't add a revlog entry when the card was
// reset.
} else if first_of_last_learn_entries.is_some() {
break;
}
}
if training {