Merge branch 'master' of github.com:dae/anki

This commit is contained in:
Damien Elmes 2013-01-15 04:14:26 +09:00
commit 4ab78cf07c
2 changed files with 2 additions and 2 deletions

View file

@ -153,7 +153,7 @@ from revlog where id > ? """+lim, (self.col.sched.dayCutoff-86400)*1000)
# studied # studied
def bold(s): def bold(s):
return "<b>"+unicode(s)+"</b>" return "<b>"+unicode(s)+"</b>"
msgp1 = ngettext("%d card", "%d cards", cards) % cards msgp1 = ngettext("<!--studied-->%d card", "<!--studied-->%d cards", cards) % cards
b += _("Studied %(a)s in %(b)s today.") % dict( b += _("Studied %(a)s in %(b)s today.") % dict(
a=bold(msgp1), b=bold(fmtTimeSpan(thetime, unit=1))) a=bold(msgp1), b=bold(fmtTimeSpan(thetime, unit=1)))
# again/pass count # again/pass count

View file

@ -152,7 +152,7 @@ select count(), sum(time)/1000 from revlog
where id > ?""", (self.mw.col.sched.dayCutoff-86400)*1000) where id > ?""", (self.mw.col.sched.dayCutoff-86400)*1000)
cards = cards or 0 cards = cards or 0
thetime = thetime or 0 thetime = thetime or 0
msgp1 = ngettext("%d card", "%d cards", cards) % cards msgp1 = ngettext("<!--studied-->%d card", "<!--studied-->%d cards", cards) % cards
buf = _("Studied %(a)s in %(b)s today.") % dict(a=msgp1, buf = _("Studied %(a)s in %(b)s today.") % dict(a=msgp1,
b=fmtTimeSpan(thetime, unit=1)) b=fmtTimeSpan(thetime, unit=1))
return buf return buf