card model > card template

This commit is contained in:
Damien Elmes 2009-01-05 06:10:10 +09:00
parent e3feff6ca6
commit 91e90d8092
3 changed files with 6 additions and 6 deletions

View file

@ -1025,11 +1025,11 @@ select id from fieldModels where modelId = :id order by ordinal""", id=m[1])
for id in ids[1:]: for id in ids[1:]:
if len(id[1]) != cms: if len(id[1]) != cms:
msg = (_( msg = (_(
"Model '%s' has wrong card model count") % name) "Model '%s' has wrong card template count") % name)
break break
if len(id[2]) != fms: if len(id[2]) != fms:
msg = (_( msg = (_(
"Model '%s' has wrong field model count") % name) "Model '%s' has wrong field count") % name)
break break
toProcess.append((name, ids)) toProcess.append((name, ids))
if msg: if msg:
@ -1544,7 +1544,7 @@ select id from cards where cardModelId not in
(select id from cardModels)""") (select id from cardModels)""")
if ids: if ids:
self.deleteCards(ids) self.deleteCards(ids)
problems.append(_("Deleted %d cards with no card model" % problems.append(_("Deleted %d cards with no card template" %
len(ids))) len(ids)))
# facts missing a card? # facts missing a card?
ids = self.deleteDanglingFacts() ids = self.deleteDanglingFacts()

View file

@ -107,8 +107,8 @@ class Importer(object):
if active > 1 and not self.multipleCardsAllowed: if active > 1 and not self.multipleCardsAllowed:
raise ImportFormatError(type="tooManyCards", raise ImportFormatError(type="tooManyCards",
info=_(""" info=_("""
The current importer only supports a single active card model. Please disable The current importer only supports a single active card template. Please disable
all but one card model.""")) all but one card template."""))
# strip invalid cards # strip invalid cards
cards = self.stripInvalid(cards) cards = self.stripInvalid(cards)
cards = self.stripOrTagDupes(cards) cards = self.stripOrTagDupes(cards)

View file

@ -288,7 +288,7 @@ class CardStats(object):
self.addLine(_("Total Time"), _("%0.1f seconds") % self.addLine(_("Total Time"), _("%0.1f seconds") %
c.reviewTime) c.reviewTime)
self.addLine(_("Model Tags") + " "*5, c.fact.model.tags) self.addLine(_("Model Tags") + " "*5, c.fact.model.tags)
self.addLine(_("Card Model"), c.cardModel.name) self.addLine(_("Card Template"), c.cardModel.name)
self.txt += "</table>" self.txt += "</table>"
return self.txt return self.txt