From 4c16d42e1f4f9260f06287abf36e3218e65ef769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 30 May 2011 17:33:23 +0200 Subject: [PATCH] Fix float_time_to_text with Python 2.7 for issue2032 --- tryton/common/common.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tryton/common/common.py b/tryton/common/common.py index d4bdd5a0e9..71d4acc27a 100644 --- a/tryton/common/common.py +++ b/tryton/common/common.py @@ -1333,17 +1333,13 @@ def float_time_to_text(val, conv=None): val = val - hours mins = int((val% 1 + 0.01) / conv['m']) if years: - value += ' ' + locale.format('%d' + FLOAT_TIME_SEPS['Y'], - years, True) + value += ' ' + locale.format('%d', years, True) + FLOAT_TIME_SEPS['Y'] if months: - value += ' ' + locale.format('%d' + FLOAT_TIME_SEPS['M'], - months, True) + value += ' ' + locale.format('%d', months, True) + FLOAT_TIME_SEPS['M'] if weeks: - value += ' ' + locale.format('%d' + FLOAT_TIME_SEPS['w'], - weeks, True) + value += ' ' + locale.format('%d', weeks, True) + FLOAT_TIME_SEPS['w'] if days: - value += ' ' + locale.format('%d' + FLOAT_TIME_SEPS['d'], - days, True) + value += ' ' + locale.format('%d', days, True) + FLOAT_TIME_SEPS['d'] if hours or mins: value += ' %02d:%02d' % (hours, mins) value = value.strip()