[PATCH] Make complete text mention updates (#244431)

[Jeremy Katz]

Mention that updates are available and sync up text for completion between
text mode and GUI
---
 iw/congrats_gui.py     |   17 ++++++-----------
 textw/complete_text.py |   16 ++++++----------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index 66a4540..ea2e435 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -66,17 +66,12 @@ class CongratulationWindow (InstallWindow):
        a.set_size_request(200, -1)
             hbox.pack_start (a, False, False, 36)

-        bootstr = ""
-        if iutil.isS390() or os.path.exists("/dev/live-osimg"):
-            floppystr = _("Please reboot the system to use the installed "
-                          "system.\n\n")
-        else:
-            floppystr = _("Press the "Reboot" button to reboot your system."
-                          "\n\n")
-
-
-        txt = _("Congratulations, the installation is complete.\n\n"
-                "%s%s") %(floppystr, bootstr)
+        txt = _("Congratulations, your %s installation is complete.\n\n"
+                "Please reboot the system to use the installed system.  "
+                "Note that updates may be available to ensure the proper "
+                "functioning of your system and installation of these "
+                "updates is recommended after initially booting your "
+                "system.") %(productName,)
    label = gui.WrappingLabel(txt)
         label.set_size_request(250, -1)

diff --git a/textw/complete_text.py b/textw/complete_text.py
index c6ab30a..9b1871f 100644
--- a/textw/complete_text.py
+++ b/textw/complete_text.py
@@ -29,20 +29,16 @@ class FinishedWindow:
   def __call__ (self, screen, anaconda):
         bootstr = ""

-        floppystr = _("Press <Enter> to end the installation process.\n\n")
         bottomstr = _("<Enter> to exit")

screen.pushHelpLine (string.center(bottomstr, screen.width))

-        txt = _("Congratulations, your %s installation is "
-                "complete.\n\n"
-                "%s%s") %(productName, floppystr, bootstr)
-        foo = _("For information on errata (updates and bug fixes), visit "
-                "http://www.redhat.com/errata/.%5Cn%5Cn"
-                "Information on using your "
-                "system is available in the %s manuals at "
-                "http://www.redhat.com/docs/.") %(productName,)
-
+        txt = _("Congratulations, your %s installation is complete.\n\n"
+                "Please reboot the system to use the installed system.  "
+                "Note that updates may be available to ensure the proper "
+                "functioning of your system and installation of these "
+                "updates is recommended after initially booting your "
+                "system.") %(productName,)
         rc = ButtonChoiceWindow (screen, _("Complete"), txt,
                                  [ _("Reboot") ], help = "finished", width=60)

[Jesse Keating]

On Mon, 2008-12-01 at 15:32 -0500, Jeremy Katz wrote:
>            "Please reboot the system to use the installed system.  "
>            "Note that updates may be available to ensure the proper "

That sounds a bit redundant.  Sorry for the bike shedding, but "Please
reboot to use the installed system." perhaps?

[Jeremy Katz]

On Mon, 2008-12-01 at 12:52 -0800, Jesse Keating wrote:
> On Mon, 2008-12-01 at 15:32 -0500, Jeremy Katz wrote:
> >            "Please reboot the system to use the installed system.  "
> >            "Note that updates may be available to ensure the proper "
>
> That sounds a bit redundant.  Sorry for the bike shedding, but "Please
> reboot to use the installed system." perhaps?

Sounds good to me.  I wrote each of these string change patches a few
times to try to get the best wording, but eventually decided to just
send them and that the review would make the wording better :-)

Jeremy

[David Cantrell]

Jeremy Katz wrote:
> On Mon, 2008-12-01 at 12:52 -0800, Jesse Keating wrote:
> > On Mon, 2008-12-01 at 15:32 -0500, Jeremy Katz wrote:
> > >            "Please reboot the system to use the installed system.  "
> > >            "Note that updates may be available to ensure the proper "
> >
> > That sounds a bit redundant.  Sorry for the bike shedding, but "Please
> > reboot to use the installed system." perhaps?
>
> Sounds good to me.  I wrote each of these string change patches a few
> times to try to get the best wording, but eventually decided to just
> send them and that the review would make the wording better :-)

I also support Jesse's change.  Aside from that, looks good.