use format_string()

This commit is contained in:
Damien Elmes 2009-03-24 09:05:35 +09:00
parent 9fba248489
commit eed5df1038

View file

@ -51,7 +51,7 @@ def fmtTimeSpan(time, pad=0, point=0, short=False):
else: else:
fmt = timeTable[type](_pluralCount(round(time, point))) fmt = timeTable[type](_pluralCount(round(time, point)))
timestr = "%(a)d.%(b)df" % {'a': pad, 'b': point} timestr = "%(a)d.%(b)df" % {'a': pad, 'b': point}
return locale.format("%" + (fmt % timestr), time) return locale.format_string("%" + (fmt % timestr), time)
def fmtTimeSpanPair(time1, time2, short=False): def fmtTimeSpanPair(time1, time2, short=False):
(type, point) = optimalPeriod(time1, 0) (type, point) = optimalPeriod(time1, 0)
@ -64,8 +64,8 @@ def fmtTimeSpanPair(time1, time2, short=False):
fmt = timeTable[type](2) fmt = timeTable[type](2)
timestr = "%(a)d.%(b)df" % {'a': pad, 'b': point} timestr = "%(a)d.%(b)df" % {'a': pad, 'b': point}
finalstr = "%s-%s" % ( finalstr = "%s-%s" % (
locale.format('%' + timestr, time1), locale.format_string('%' + timestr, time1),
locale.format('%' + timestr, time2),) locale.format_string('%' + timestr, time2),)
return fmt % finalstr return fmt % finalstr
def optimalPeriod(time, point): def optimalPeriod(time, point):