Merge lp:~ilidrissi.amine/update-manager/update-manager.fix-288912 into lp:update-manager

[Mohamed Amine Ilidrissi]

This fixes bug 288912.

=== modified file 'DistUpgrade/DistUpgradeView.py'
--- DistUpgrade/DistUpgradeView.py	2010-07-12 14:19:33 +0000
+++ DistUpgrade/DistUpgradeView.py	2010-08-11 19:03:44 +0000
@@ -66,6 +66,9 @@
 
   # now assemble the string
   if days > 0:
+    # Don't print str_hours if it's an empty string, see LP: #288912
+    if map["str_hours"] == '':
+        return map["str_days"]
     # TRANSLATORS: you can alter the ordering of the remaining time
     # information here if you shuffle %(str_days)s %(str_hours)s %(str_minutes)s
     # around. Make sure to keep all '$(str_*)s' in the translated string
@@ -81,6 +84,9 @@
     return map["str_hours"]
   # when we are near the end, become more precise again
   elif hours > 0:
+    # Don't print str_minutes if it's an empty string, see LP: #288912
+    if map["str_minutes"] == '':
+        return map["str_hours"]
     # TRANSLATORS: you can alter the ordering of the remaining time
     # information here if you shuffle %(str_hours)s %(str_minutes)s
     # around. Make sure to keep all '$(str_*)s' in the translated string
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-08-11 07:07:48 +0000
+++ debian/changelog	2010-08-11 19:03:44 +0000
@@ -1,3 +1,11 @@
+update-manager (1:0.142.8) UNRELEASED; urgency=low
+
+  * DistUpgrade/DistUpgradeView.py: There won't be two spaces in
+    FuzzyTimeToStr when days or hours are > 0 and hours or minutes are
+    equal to 0 (LP: #288912)
+
+ -- Mohamed Amine IL Idrissi <[e-mail]>  Wed, 11 Aug 2010 18:03:33 +0000
+
 update-manager (1:0.142.7) maverick; urgency=low
   
   [ Mohamed Amine IL Idrissi ]