Merge branch 'master' of git://github.com/timo/ankiqt

This commit is contained in:
Damien Elmes 2008-12-18 14:54:21 +09:00
commit 36a5378aba
2 changed files with 7 additions and 5 deletions

View file

@ -525,7 +525,7 @@ where id in (%s)""" % ",".join([
self.updateAfterCardChange() self.updateAfterCardChange()
def addTags(self): def addTags(self):
(tags, r) = ui.utils.getTag(self, self.deck, _("Enter tag(s) to add:")) (tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to add:"))
if tags: if tags:
n = _("Add Tags") n = _("Add Tags")
self.deck.setUndoStart(n) self.deck.setUndoStart(n)
@ -534,7 +534,7 @@ where id in (%s)""" % ",".join([
self.updateAfterCardChange() self.updateAfterCardChange()
def deleteTags(self): def deleteTags(self):
(tags, r) = ui.utils.getTag(self, self.deck, _("Enter tag(s) to delete:")) (tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to delete:"))
if tags: if tags:
n = _("Delete Tags") n = _("Delete Tags")
self.deck.setUndoStart(n) self.deck.setUndoStart(n)

View file

@ -11,6 +11,7 @@ from anki.utils import parseTags
from anki.deck import newCardOrderLabels, newCardSchedulingLabels from anki.deck import newCardOrderLabels, newCardSchedulingLabels
from anki.deck import revCardOrderLabels from anki.deck import revCardOrderLabels
from anki.utils import hexifyID, dehexifyID from anki.utils import hexifyID, dehexifyID
from anki.lang import ngettext
tabs = ("Scheduling", tabs = ("Scheduling",
"Synchronization", "Synchronization",
@ -111,9 +112,10 @@ class DeckProperties(QDialog):
self.dialog.modelsList.clear() self.dialog.modelsList.clear()
self.models = [] self.models = []
for model in self.d.models: for model in self.d.models:
name = _("%(name)s [%(facts)d facts]") % { name = ngettext("%(name)s [%(facts)d fact]",
'name': model.name, "%(name)s [%(facts)d facts]", self.d.modelUseCount(model)) % {
'facts': self.d.modelUseCount(model), 'name': model.name,
'facts': self.d.modelUseCount(model),
} }
self.models.append((name, model)) self.models.append((name, model))
self.models.sort() self.models.sort()