diff options
| author | David Lehman <dlehman@redhat.com> | 2009-03-04 20:45:57 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-03-04 20:45:57 -0600 |
| commit | db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3 (patch) | |
| tree | 0279b0573115d6d79f5b4c1892fdd55cb5f7f41b /textw | |
| parent | 78b1415591a1db738d0c09b9de50e501e2048c28 (diff) | |
| parent | 270003cd1f0c09a77608c4b0a07687c822f56274 (diff) | |
| download | anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.tar.gz anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.tar.xz anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.zip | |
Merge branch 'master' into storage
Conflicts:
anaconda
fsset.py
iutil.py
iw/partition_gui.py
partedUtils.py
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/complete_text.py | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/textw/complete_text.py b/textw/complete_text.py index df735547f..1793cab10 100644 --- a/textw/complete_text.py +++ b/textw/complete_text.py @@ -28,17 +28,37 @@ class FinishedWindow: def __call__ (self, screen, anaconda): bootstr = "" + buttonstr = _("Reboot") bottomstr = _("<Enter> to exit") screen.pushHelpLine (string.center(bottomstr, screen.width)) - txt = _("Congratulations, your %s installation is complete.\n\n" - "Please reboot 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 the reboot.") %(productName,) + if iutil.isS390(): + txt = _("Congratulations, your %s installation is complete.\n\n") % (productName,) + + if not anaconda.canReIPL: + buttonstr = _("Shutdown") + + txt = txt + _("Please shutdown to use the installed system.\n") + else: + txt = txt + _("Please reboot to use the installed system.\n") + + if not anaconda.reIPLMessage is None: + txt = txt + "\n" + anaconda.reIPLMessage + "\n\n" + + txt = txt + _("Note that updates may be available to ensure the proper " + "functioning of your system and installation of these " + "updates is recommended after the reboot.") + else: + txt = _("Congratulations, your %s installation is complete.\n\n" + "Please reboot 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 the reboot.") %(productName,) + + rc = ButtonChoiceWindow (screen, _("Complete"), txt, - [ _("Reboot") ], help = "finished", width=60) + [ buttonstr ], help = "finished", width=60) return INSTALL_OK |