seperate supported languages from install language

5 files changed, 110 insertions, 16 deletions

diff --git a/gui.py b/gui.py
index 29e8b5a07..4d1745fb6 100755
--- a/gui.py
+++ b/gui.py
@@ -67,6 +67,7 @@ from translate import cat, _
 from gnome.ui import *
 from gnome.xmhtml import *
 from language_gui import *
+from language_support_gui import *
 from welcome_gui import *
 from mouse_gui import *
 from keyboard_gui import *
@@ -337,12 +338,14 @@ class InstallInterface:
 
         else:
             if todo.serial:
-                commonSteps = [ ( LanguageWindow, "language" ), 
+                commonSteps = [ ( LanguageWindow, "language" ),
+                                ( LanguageSupportWindow, "languagesupport" ), 
                                 ( WelcomeWindow, "welcome" ),
                                 ( InstallPathWindow, "installtype" ),
                                 ]
             else:
                 commonSteps = [ ( LanguageWindow, "language" ), 
+                                ( LanguageSupportWindow, "languagesupport" ), 
                                 ( KeyboardWindow, "keyboard" ),
                                 ( MouseWindow, "mouse" ),
                                 ( WelcomeWindow, "welcome" ),
@@ -365,11 +368,17 @@ class InstallInterface:
         self.icw.run ()
 
 class InstallControlWindow:
+    def getLanguage (self):
+        return self.lang
+    
     def setLanguage (self, lang):
         newlangs = [lang]
         
         if len(lang) > 2:
             newlangs.append(lang[:2])
+        self.lang = lang
+        
+        os.environ["LC_ALL"] = lang        
         self.locale = lang[:2]
 
         cat.setlangs (newlangs)
@@ -691,8 +700,10 @@ class InstallControlWindow:
         self.steps = steps
         if os.environ.has_key ("LC_ALL"):
             self.locale = os.environ["LC_ALL"][:2]
+            self.lang = os.environ["LC_ALL"]
         else:
             self.locale = "C"
+            self.lang = "en_US"
 
     def keyRelease (self, window, event):
         if ((event.keyval == KP_Delete or event.keyval == Delete)
diff --git a/iw/language_gui.py b/iw/language_gui.py
index b07fd08c7..96271221f 100644
--- a/iw/language_gui.py
+++ b/iw/language_gui.py
@@ -24,7 +24,6 @@ class LanguageWindow (InstallWindow):
 
     def getNext (self):
         if self.lang:
-            self.todo.language.set (self.lang)
             self.icw.setLanguage (self.languages[self.lang])
         return None
 
@@ -53,7 +52,7 @@ class LanguageWindow (InstallWindow):
         n = 0
         for locale in language_keys:
             row = self.language.append ((locale,))
-            if self.languages[locale] == self.todo.language.get ():
+            if self.languages[locale] == self.icw.getLanguage ():
                 default = n
             n = n + 1
 
diff --git a/iw/xpms_gui.py b/iw/xpms_gui.py
index a28c31c1b..0a785865a 100644
--- a/iw/xpms_gui.py
+++ b/iw/xpms_gui.py
@@ -1933,4 +1933,71 @@ CHECKBOX_OFF_XPM = [
 "+...........+",
 "+++++++++++++"]
 
+RADIOBUTTON_ON_XPM = [
+"13 13 14 1",
+" 	c None",
+".	c #888888",
+"+	c #000000",
+"@	c #FFFFFF",
+"#	c #C0C0C0",
+"$	c #DBDBDB",
+"%	c #EAEAEA",
+"&	c #E9E9E9",
+"*	c #E8E8E8",
+"=	c #E7E7E7",
+"-	c #D2D2D2",
+";	c #D7D7D7",
+">	c #E6E6E6",
+",	c #E5E5E5",
+"   .......   ",
+"  .+++++++.  ",
+" .+@@@@@@@#$ ",
+".+@@@@@@@@@# ",
+".+@@@+++@@@#%",
+".+@@+++++@@#&",
+".+@@+++++@@#*",
+".+@@+++++@@#*",
+".+@@@+++@@@#=",
+".+@@@@@@@@@#&",
+" .#@@@@@@@#- ",
+"   #######;  ",
+"    >>=>=,   "]
+
+RADIOBUTTON_OFF_XPM = [
+"13 13 14 1",
+" 	c None",
+".	c #888888",
+"+	c #000000",
+"@	c #FFFFFF",
+"#	c #C0C0C0",
+"$	c #DBDBDB",
+"%	c #EAEAEA",
+"&	c #E9E9E9",
+"*	c #E8E8E8",
+"=	c #E7E7E7",
+"-	c #D2D2D2",
+";	c #D7D7D7",
+">	c #E6E6E6",
+",	c #E5E5E5",
+"   .......   ",
+"  .+++++++.  ",
+" .+@@@@@@@#$ ",
+".+@@@@@@@@@# ",
+".+@@@@@@@@@#%",
+".+@@@@@@@@@#&",
+".+@@@@@@@@@#*",
+".+@@@@@@@@@#*",
+".+@@@@@@@@@#=",
+".+@@@@@@@@@#&",
+" .#@@@@@@@#- ",
+"   #######;  ",
+"    >>=>=,   "]
+
+
+
+
+
+
+
+
 
diff --git a/text.py b/text.py
index 6a5054732..13dee0c48 100644
--- a/text.py
+++ b/text.py
@@ -86,6 +86,7 @@ class LanguageWindow:
             screen.finish()
             os.execv ("/sbin/loader", args)
 
+        os.environ["LC_ALL"] = lang
         newlangs = [lang]
 	if len(lang) > 2:
             newlangs.append(lang[:2])
diff --git a/todo.py b/todo.py
index 1ae8bef0f..4071d1274 100644
--- a/todo.py
+++ b/todo.py
@@ -1,6 +1,6 @@
 import rpm
 import os
-rpm.addMacro("_i18ndomains", "redhat-dist");
+rpm.addMacro("_i18ndomains", "redhat-dist")
 
 import iutil, isys
 from lilo import LiloConfiguration
@@ -214,6 +214,7 @@ class Desktop (SimpleConfigFile):
 class Language (SimpleConfigFile):
     def __init__ (self):
         self.info = {}
+        self.info["SUPPORTED"] = None
 
 	if os.access("lang-table", os.R_OK):
 	    f = open("lang-table", "r")
@@ -252,17 +253,32 @@ class Language (SimpleConfigFile):
 
     def setByAbbrev(self, lang):
 	self.set(self.abbrevMap[lang])
+
+    def getSupported (self):
+        if self.info["SUPPORTED"]:
+            return string.split (self.info["SUPPORTED"], ':')
+        return []
+
+    def setSupported (self, langlist):
+        if langlist:
+            linguas = string.join (langlist, ':')
+            os.environ["LINGUAS"] = linguas
+            rpm.addMacro("_install_langs", linguas)
+            self.info["SUPPORTED"] = linguas
+        else:
+            self.info["SUPPORTED"] = None
+            rpm.delMacro ("_install_langs")
     
     def set (self, lang):
         self.lang = self.langs[lang]
         os.environ["LANG"] = self.langs[lang]
         if self.japanesehack:
             self.info["LANG"] = "ja_JP.eucJP"
-            rpm.addMacro("_install_langs", "ja_JP.eucJP");
+            rpm.addMacro("_install_langs", "ja_JP.eucJP")
             os.environ["LINGUAS"] = "ja_JP.eucJP"
         else:
             self.info["LANG"] = self.langs[lang]
-            rpm.addMacro("_install_langs", self.langs[lang]);
+            rpm.addMacro("_install_langs", self.langs[lang])
             os.environ["LINGUAS"] = self.langs[lang]
 
 	if self.font[lang] != "None":
@@ -1019,8 +1035,8 @@ class ToDo:
                                     _("Finding packages to upgrade..."))
 
         self.dbpath = "/var/lib/anaconda-rebuilddb" + str(int(time.time()))
-        rpm.addMacro("_dbpath_rebuild", self.dbpath);
-        rpm.addMacro("_dbapi", "-1");
+        rpm.addMacro("_dbpath_rebuild", self.dbpath)
+        rpm.addMacro("_dbapi", "-1")
 
         # now, set the system clock so the timestamps will be right:
         iutil.setClock (self.instPath)
@@ -1712,7 +1728,7 @@ class ToDo:
                 self.createRemovable("zip", partNum = 4)
                 self.createRemovable("jaz", partNum = 4)
 
-		w.set(1);
+		w.set(1)
 
                 self.copyExtraModules()
                 self.fstab.write (self.instPath)
@@ -1722,7 +1738,7 @@ class ToDo:
                     self.initlevel = self.instClass.defaultRunlevel
                     self.setDefaultRunlevel ()
 
-		w.set(2);
+		w.set(2)
 
                 # pcmcia is supported only on i386 at the moment
                 if arch == "i386":
@@ -1742,7 +1758,7 @@ class ToDo:
                     self.x.write (self.instPath + "/etc/X11")
                 self.setDefaultRunlevel ()
 
-		w.set(3);
+		w.set(3)
 
                 # blah.  If we're on a serial mouse, and we have X, we need to
                 # close the mouse device, then run kudzu, then open it again.
@@ -1797,7 +1813,7 @@ class ToDo:
                 if unmountUSB:
                     isys.umount(self.instPath + '/proc/bus/usb', removeDir = 0)
 
-	    w.set(4);
+	    w.set(4)
 
             if self.upgrade:
                 # move the rebuilt db into place.
@@ -1829,18 +1845,18 @@ class ToDo:
                 else:
                     raise RuntimeError, "What kind of machine is this, anyway?!"
 
-		w.set(5);
+		w.set(5)
 
 
                 # go ahead and depmod modules as modprobe in rc.sysinit
                 # will complain loaduly if we don't do it now.
                 self.depmodModules()
 
-	    w.set(6);
+	    w.set(6)
 
             self.instClass.postAction(self.instPath, self.serial)
 
-	    w.set(7);
+	    w.set(7)
 
             if self.setupFilesystems:
                 f = open("/tmp/cleanup", "w")
@@ -1848,7 +1864,7 @@ class ToDo:
                 self.fstab.writeCleanupPath(f)
                 f.close()
 
-	    w.set(8);
+	    w.set(8)
 
             del syslog