diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 98116e159..58964f6bc 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -162,6 +162,7 @@ Lucas Scharenbroch Antonio Cavallo Han Yeong-woo Jean Khawand +Pedro Schreiber Foxy_null Arbyste ******************** diff --git a/ftl/core/browsing.ftl b/ftl/core/browsing.ftl index 785e01da1..9b85460b9 100644 --- a/ftl/core/browsing.ftl +++ b/ftl/core/browsing.ftl @@ -20,6 +20,11 @@ browsing-cards-deleted = [one] { $count } card deleted. *[other] { $count } cards deleted. } +browsing-cards-deleted-with-deckname = + { $count -> + [one] { $count } card deleted from {$deck_name}. + *[other] { $count } cards deleted from {$deck_name}. + } browsing-change-deck = Change Deck browsing-change-deck2 = Change Deck... browsing-change-note-type = Change Note Type diff --git a/qt/aqt/browser/sidebar/tree.py b/qt/aqt/browser/sidebar/tree.py index d7dcefc2a..ef03cc91e 100644 --- a/qt/aqt/browser/sidebar/tree.py +++ b/qt/aqt/browser/sidebar/tree.py @@ -1083,7 +1083,9 @@ class SidebarTreeView(QTreeView): ).run_in_background() def delete_decks(self, _item: SidebarItem) -> None: - remove_decks(parent=self, deck_ids=self._selected_decks()).run_in_background() + remove_decks( + parent=self, deck_name=_item.name, deck_ids=self._selected_decks() + ).run_in_background() # Tags ########################### diff --git a/qt/aqt/deckbrowser.py b/qt/aqt/deckbrowser.py index 163e639c0..68f0b0c27 100644 --- a/qt/aqt/deckbrowser.py +++ b/qt/aqt/deckbrowser.py @@ -356,7 +356,12 @@ class DeckBrowser: ).run_in_background() def _delete(self, did: DeckId) -> None: - remove_decks(parent=self.mw, deck_ids=[did]).run_in_background() + deck_name = self.mw.col.decks.find_deck_in_tree( + self._render_data.tree, did + ).name + remove_decks( + parent=self.mw, deck_ids=[did], deck_name=deck_name + ).run_in_background() # Top buttons ###################################################################### diff --git a/qt/aqt/operations/deck.py b/qt/aqt/operations/deck.py index 1b2bbab1e..bddf07fc2 100644 --- a/qt/aqt/operations/deck.py +++ b/qt/aqt/operations/deck.py @@ -16,9 +16,16 @@ def remove_decks( *, parent: QWidget, deck_ids: Sequence[DeckId], + deck_name: str, ) -> CollectionOp[OpChangesWithCount]: return CollectionOp(parent, lambda col: col.decks.remove(deck_ids)).success( - lambda out: tooltip(tr.browsing_cards_deleted(count=out.count), parent=parent) + lambda out: tooltip( + tr.browsing_cards_deleted_with_deckname( + count=out.count, + deck_name=deck_name, + ), + parent=parent, + ) )