From 756a5b7ba41b6f948eb5d8f87c1bdfb4c5bc65f9 Mon Sep 17 00:00:00 2001 From: Preston Cody Date: Mon, 3 Dec 2007 22:51:29 +0000 Subject: add a check for no hard drives found so it doesn't barf. make some language-related gettext changes. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1880 f8877401-5920-0410-a79b-8e2d7e04ca0d --- src/fe/dialog/gli-dialog.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/fe/dialog/gli-dialog.py b/src/fe/dialog/gli-dialog.py index 4ebaa04..7af746f 100755 --- a/src/fe/dialog/gli-dialog.py +++ b/src/fe/dialog/gli-dialog.py @@ -205,14 +205,14 @@ Press OK to continue""") else: status = GLIUtility.spawn("/sbin/dhcpcd -t 15 -n " + interface) if not GLIUtility.exitsuccess(status): - self._d.msgbox("ERROR: Could not run dhcpcd command!") #FIXME LANGUAGE + self._d.msgbox(_(u"ERROR: Could not run dhcpcd command!")) elif network_type == "static": # Configure the network from the settings they gave. if not GLIUtility.set_ip(interface, ip_address, broadcast, netmask): - self._d.msgbox("ERROR: Could not set the IP address!") #FIXME LANGUAGE + self._d.msgbox(_(u"ERROR: Could not set the IP address!")) if not GLIUtility.set_default_route(gateway): - self._d.msgbox("ERROR: Could not set the default route!") #FIXME LANGUAGE + self._d.msgbox(_(u"ERROR: Could not set the default route!")) if dns_servers: try: @@ -221,7 +221,7 @@ Press OK to continue""") resolv_conf.write("nameserver " + dns_server + "\n") resolv_conf.close() except: - self._d.msgbox("ERROR: Could not set the DNS servers!") #FIXME LANGUAGE + self._d.msgbox(_(u"ERROR: Could not set the DNS servers!")) time.sleep(5) #Give the backgrounded process a chance. #Test the connection to make sure everything worked. @@ -479,6 +479,9 @@ Press OK to continue""") choice_list.append((drive, devices[drive].get_model())) self._drives = drives #Store for use in mounts. self._devices = devices #Store for use in mounts. + if not choices_list: + self._d.msgbox(_(u"Error: no hard drives found. Please load the appropriate modules for these drives and restart the installer.")) + sys.exit(0) while 1: code, drive_to_partition = self._d.menu(_(u"Which drive would you like to partition?\n Info provided: Type, Size in MB"), choices=choice_list, cancel=_(u"Done"), width=65) if code != self._DLG_OK: break @@ -1076,7 +1079,7 @@ Press OK to continue""") # This section will be for choosing kernel sources, choosing (and specifying) a custom config or genkernel, modules to load at startup, etc. kernel_sources = [("livecd-kernel", _(u"Copy over the current running kernel (fastest)")), ("vanilla-sources", _(u"The Unaltered Linux Kernel ver 2.6+ (safest)")), - ("gentoo-sources", _(u"Gentoo's optimized 2.6+ kernel. (less safe)")+" (RECOMMENDED)"), #FIXME LANGUAGE + ("gentoo-sources", _(u"Gentoo's optimized 2.6+ kernel. (RECOMMENDED)"), ("hardened-sources", _(u"Hardened sources for the 2.6 kernel tree")), ("grsec-sources",_(u"Vanilla sources with grsecurity patches")), (_(u"Other"), _(u"Choose one of the other sources available."))] -- cgit v1.2.3-65-gdbad