8505 minor messaging fixups in gui
authorPadraig O'Briain <padraig.obriain@sun.com>
Wed, 10 Jun 2009 12:12:46 +0100
changeset 1136 27b3bc1f4768
parent 1135 ecf0a27789e3
child 1137 f6c7c39981aa
8505 minor messaging fixups in gui
src/gui/modules/installupdate.py
src/updatemanager.py
--- a/src/gui/modules/installupdate.py	Wed Jun 10 12:02:56 2009 +0100
+++ b/src/gui/modules/installupdate.py	Wed Jun 10 12:12:46 2009 +0100
@@ -550,7 +550,7 @@
 
         def __proceed_with_stages_thread(self):
                 self.__start_substage(
-                    _("Gathering packages information, please wait..."))
+                    _("Gathering package information, please wait..."))
                 stuff_todo = self.__plan_stage()
                 if stuff_todo:
                         self.__afterplan_information()
--- a/src/updatemanager.py	Wed Jun 10 12:02:56 2009 +0100
+++ b/src/updatemanager.py	Wed Jun 10 12:12:46 2009 +0100
@@ -1045,23 +1045,23 @@
                 self.__cleanup()
 
         def __display_update_image_success(self):
-                elapsed = (time.time() - self.ua_start)/ 60.0 
+                elapsed_sec = int(time.time() - self.ua_start)
+                elapsed_min = elapsed_sec / 60
                 info_str = ""
-                if elapsed >= 1.0:
-                        info_str = \
-                            _(
-                            "\nUpdate All finished successfully in %1.f mins\n\n" %
-                            elapsed)
+                if elapsed_sec >= 120:
+                        info_str = _(
+                           "Update All finished successfully in %d minutes.") \
+                           % elapsed_min
                 else:
-                        info_str = \
-                            _(
-                            "\nUpdate All finished successfully in < 1 min\n\n")
-                self.w_um_completed_time_label.set_text(info_str.strip('\n'))
+                        info_str = _(
+                            "Update All finished successfully in %d seconds.") \
+                             % elapsed_sec
+                self.w_um_completed_time_label.set_text(info_str)
 
                 info_str = _(
-                    "Review the posted release notes before rebooting your system:\n\n"
+                    "Review the posted release notes before rebooting your system:"
                     )
-                self.w_um_completed_release_label.set_text(info_str.strip('\n'))
+                self.w_um_completed_release_label.set_text(info_str)
 
                 info_str = misc.get_release_notes_url()
                 self.w_um_completed_linkbutton.set_uri(info_str)