diff -Nur ./update-manager-0.87.6.dist/AutoUpgradeTester/DistUpgrade/DistUpgradeView.py update-manager-0.87.6/AutoUpgradeTester/DistUpgrade/DistUpgradeView.py --- ./update-manager-0.87.6.dist/AutoUpgradeTester/DistUpgrade/DistUpgradeView.py 2008-01-28 09:52:26.000000000 +0000 +++ update-manager-0.87.6/AutoUpgradeTester/DistUpgrade/DistUpgradeView.py 2008-02-29 23:37:02.000000000 +0000 @@ -23,20 +23,24 @@ import subprocess import apt import os - +import gettext from DistUpgradeApport import * def FuzzyTimeToStr(sec): " return the time a bit fuzzy (no seconds if time > 60 secs " - if sec > 60*60*24: - return _("%li days %li hours %li minutes") % (sec/60/60/24, (sec/60/60) % 24, (sec/60) % 60) + strTime = "" + if sec <= 60: + strTime = `sec%60` + " " + gettext.ngettext("second", "seconds", sec%60) + return strTime + if sec > (60*60*24): + strTime = `sec/60/60/24` + " " + gettext.ngettext("day", "days", sec/60/60/24) if sec > 60*60: - return _("%li hours %li minutes") % (sec/60/60, (sec/60) % 60) + strTime = strTime + " " + `(sec/60/60)%24` + " " + gettext.ngettext("hour", "hours", sec/60/60%24) if sec > 60: - return _("%li minutes") % (sec/60) - return _("%li seconds") % sec - + strTime = strTime + " " + `(sec/60)%60` + " " + gettext.ngettext("minute", "minutes", sec/60%60) + + return strTime class FetchProgress(apt.progress.FetchProgress): def __init__(self): Binary files ./update-manager-0.87.6.dist/AutoUpgradeTester/DistUpgrade/DistUpgradeView.pyc and update-manager-0.87.6/AutoUpgradeTester/DistUpgrade/DistUpgradeView.pyc differ diff -Nur ./update-manager-0.87.6.dist/DistUpgrade/DistUpgradeView.py update-manager-0.87.6/DistUpgrade/DistUpgradeView.py --- ./update-manager-0.87.6.dist/DistUpgrade/DistUpgradeView.py 2008-01-28 09:52:26.000000000 +0000 +++ update-manager-0.87.6/DistUpgrade/DistUpgradeView.py 2008-02-29 23:37:02.000000000 +0000 @@ -23,20 +23,24 @@ import subprocess import apt import os - +import gettext from DistUpgradeApport import * def FuzzyTimeToStr(sec): " return the time a bit fuzzy (no seconds if time > 60 secs " - if sec > 60*60*24: - return _("%li days %li hours %li minutes") % (sec/60/60/24, (sec/60/60) % 24, (sec/60) % 60) + strTime = "" + if sec <= 60: + strTime = `sec%60` + " " + gettext.ngettext("second", "seconds", sec%60) + return strTime + if sec > (60*60*24): + strTime = `sec/60/60/24` + " " + gettext.ngettext("day", "days", sec/60/60/24) if sec > 60*60: - return _("%li hours %li minutes") % (sec/60/60, (sec/60) % 60) + strTime = strTime + " " + `(sec/60/60)%24` + " " + gettext.ngettext("hour", "hours", sec/60/60%24) if sec > 60: - return _("%li minutes") % (sec/60) - return _("%li seconds") % sec - + strTime = strTime + " " + `(sec/60)%60` + " " + gettext.ngettext("minute", "minutes", sec/60%60) + + return strTime class FetchProgress(apt.progress.FetchProgress): def __init__(self): Binary files ./update-manager-0.87.6.dist/DistUpgrade/DistUpgradeView.pyc and update-manager-0.87.6/DistUpgrade/DistUpgradeView.pyc differ