diff --git a/anki/utils.py b/anki/utils.py index 10c0598f3..9e811efc7 100644 --- a/anki/utils.py +++ b/anki/utils.py @@ -50,8 +50,8 @@ def fmtTimeSpan(time, pad=0, point=0, short=False): fmt = shortTimeTable[type] else: fmt = timeTable[type](_pluralCount(round(time, point))) - timestr = locale.format("%(a)d.%(b)df", {'a': pad, 'b': point}) - return ("%" + (fmt % timestr)) % time + timestr = "%(a)d.%(b)df" % {'a': pad, 'b': point} + return locale.format("%" + (fmt % timestr), time) def fmtTimeSpanPair(time1, time2, short=False): (type, point) = optimalPeriod(time1, 0) @@ -62,10 +62,10 @@ def fmtTimeSpanPair(time1, time2, short=False): fmt = shortTimeTable[type] else: fmt = timeTable[type](2) - timestr = locale.format("%(a)d.%(b)df", {'a': pad, 'b': point}) + timestr = "%(a)d.%(b)df" % {'a': pad, 'b': point} finalstr = "%s-%s" % ( - ('%' + timestr) % time1, - ('%' + timestr) % time2) + locale.format('%' + timestr, time1), + locale.format('%' + timestr, time2),) return fmt % finalstr def optimalPeriod(time, point):