remove map from the lang-table. we don't ever use it anymore during the

install and isys.loadFont was just throwing out the argument (#84275)

6 files changed, 28 insertions, 51 deletions

diff --git a/isys/isys.c b/isys/isys.c
index 53098741b..02ffe0d45 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -980,7 +980,7 @@ static PyObject * doLoadFont (PyObject * s, PyObject * args) {
     char * font;
     int ret;
 
-    if (!PyArg_ParseTuple(args, "s", &font)) return NULL;
+    if (!PyArg_ParseTuple(args, "")) return NULL;
 
     ret = isysLoadFont ();
     if (ret) {
diff --git a/isys/isys.py b/isys/isys.py
index 176b572ab..f6450681a 100644
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -224,8 +224,8 @@ def swapon (path):
 def fbconProbe(path):
     return _isys.fbconprobe (path)
 
-def loadFont(font):
-    return _isys.loadFont (font)
+def loadFont():
+    return _isys.loadFont ()
 
 def loadKeymap(keymap):
     return _isys.loadKeymap (keymap)
diff --git a/lang-table b/lang-table
index 66f34aaca..82397d915 100644
--- a/lang-table
+++ b/lang-table
@@ -1,19 +1,19 @@
-Chinese(Simplified)	zh_CN	bterm    None		zh_CN.GB18030	us              Asia/Shanghai	zh_CN.UTF-8
-Chinese(Traditional)	zh_TW	bterm    None		zh_TW.Big5	us              Asia/Taipei	zh_TW.UTF-8
-Czech		cs 	latarcyrheb-sun16 	utf8	cs_CZ.UTF-8	cz-lat2		Europe/Prague	cs_CZ.UTF-8
-Danish		da	latarcyrheb-sun16	utf8	da_DK.UTF-8	us		Europe/Copenhagen	da_DK.UTF-8
-Dutch		nl	latarcyrheb-sun16	utf8	nl_NL.UTF-8	us		Europe/Amsterdam	nl_NL.UTF-8
-English		en	latarcyrheb-sun16	iso01	en_US.UTF-8 	us		America/New_York	en_US.UTF-8
-French		fr	latarcyrheb-sun16	utf8	fr_FR.UTF-8 	fr-latin1	Europe/Paris		fr_FR.UTF-8
-German		de      latarcyrheb-sun16	iso09	de_DE.UTF-8	de-latin1-nodeadkeys    Europe/Berlin	de_DE.UTF-8
-Icelandic	is	latarcyrheb-sun16	utf8	is_IS.UTF-8 	is-latin1	Atlantic/Reykjavik	is_IS.UTF-8
-Italian		it	latarcyrheb-sun16	utf8	it_IT.UTF-8	it		Europe/Rome	it_IT.UTF-8
-Japanese	ja	bterm			None	ja_JP.eucJP	jp106		Asia/Tokyo	ja_JP.UTF-8
-Korean		ko	bterm			None	ko_KR.eucKR	us		Asia/Seoul	ko_KR.UTF-8
-Norwegian	no	latarcyrheb-sun16	utf8	no_NO.UTF-8	no-latin1	Europe/Oslo	no_NO.UTF-8
-Portuguese	pt	latarcyrheb-sun16	utf8	pt_PT.UTF-8	pt-latin1	Europe/Lisbon	pt_PT.UTF-8
-Portuguese(Brazilian)	pt_BR	latarcyrheb-sun16	utf8		pt_BR.UTF-8	pt-latin1	America/Sao_Paulo pt_BR.UTF-8		
-Russian 	ru 	latarcyrheb-sun16	koi8-r	ru_RU.UTF-8	ru		Europe/Moscow	ru_RU.UTF-8
-Spanish		es	latarcyrheb-sun16	utf8	es_ES.UTF-8	es		Europe/Madrid	es_ES.UTF-8
-Swedish 	sv	latarcyrheb-sun16	utf8	sv_SE.UTF-8	se-latin1	Europe/Stockholm	sv_SE.UTF-8
-Turkish		tr	latarcyrheb-sun16	utf8	tr_TR.UTF-8	trq	Europe/Istanbul	tr_TR.UTF-8
+Chinese(Simplified)	zh_CN	bterm    zh_CN.GB18030	us              Asia/Shanghai	zh_CN.UTF-8
+Chinese(Traditional)	zh_TW	bterm    zh_TW.Big5	us              Asia/Taipei	zh_TW.UTF-8
+Czech		cs 	latarcyrheb-sun16 	cs_CZ.UTF-8	cz-lat2		Europe/Prague	cs_CZ.UTF-8
+Danish		da	latarcyrheb-sun16	da_DK.UTF-8	us		Europe/Copenhagen	da_DK.UTF-8
+Dutch		nl	latarcyrheb-sun16	nl_NL.UTF-8	us		Europe/Amsterdam	nl_NL.UTF-8
+English		en	latarcyrheb-sun16	en_US.UTF-8 	us		America/New_York	en_US.UTF-8
+French		fr	latarcyrheb-sun16	fr_FR.UTF-8 	fr-latin1	Europe/Paris		fr_FR.UTF-8
+German		de      latarcyrheb-sun16	de_DE.UTF-8	de-latin1-nodeadkeys    Europe/Berlin	de_DE.UTF-8
+Icelandic	is	latarcyrheb-sun16	is_IS.UTF-8 	is-latin1	Atlantic/Reykjavik	is_IS.UTF-8
+Italian		it	latarcyrheb-sun16	it_IT.UTF-8	it		Europe/Rome	it_IT.UTF-8
+Japanese	ja	bterm			ja_JP.eucJP	jp106		Asia/Tokyo	ja_JP.UTF-8
+Korean		ko	bterm			ko_KR.eucKR	us		Asia/Seoul	ko_KR.UTF-8
+Norwegian	no	latarcyrheb-sun16	no_NO.UTF-8	no-latin1	Europe/Oslo	no_NO.UTF-8
+Portuguese	pt	latarcyrheb-sun16	pt_PT.UTF-8	pt-latin1	Europe/Lisbon	pt_PT.UTF-8
+Portuguese(Brazilian)	pt_BR	latarcyrheb-sun1	pt_BR.UTF-8	pt-latin1	America/Sao_Paulo pt_BR.UTF-8		
+Russian 	ru 	latarcyrheb-sun16	ru_RU.UTF-8	ru		Europe/Moscow	ru_RU.UTF-8
+Spanish		es	latarcyrheb-sun16	es_ES.UTF-8	es		Europe/Madrid	es_ES.UTF-8
+Swedish 	sv	latarcyrheb-sun16	sv_SE.UTF-8	se-latin1	Europe/Stockholm	sv_SE.UTF-8
+Turkish		tr	latarcyrheb-sun16	tr_TR.UTF-8	trq	Europe/Istanbul	tr_TR.UTF-8
diff --git a/language.py b/language.py
index 7ca117f06..66c203aa0 100644
--- a/language.py
+++ b/language.py
@@ -70,7 +70,6 @@ class InstallTimeLanguage:
 	f.close()
 	self.langNicks = {}
 	self.font = {}
-	self.map = {}
 	self.kbd = {}
 	self.tz = {}
 	self.langList = []
@@ -88,16 +87,14 @@ class InstallTimeLanguage:
 	    
 	    longName = l[0]
 	    font = l[2]
-	    map = l[3]
-	    shortName = l[4]
-	    keyboard = l[5]
-	    timezone = l[6]
-            runtime = l[7]
+	    shortName = l[3]
+	    keyboard = l[4]
+	    timezone = l[5]
+            runtime = l[6]
 
 	    self.langList.append(longName)
 	    self.langNicks[longName] = shortName
 	    self.font[longName] = font
-	    self.map[longName] = map
 	    self.kbd[longName] = keyboard
 	    self.tz[longName] = timezone
             self.runtimeLangs[runtime] = shortName
@@ -108,9 +105,6 @@ class InstallTimeLanguage:
 	self.langList.sort()
         self.setRuntimeLanguage(self.getLangNameByNick(self.current))
 
-    def getFontMap (self, lang):
-	return self.map[lang]
-
     def getFontFile (self, lang):
 	# Note: in /etc/fonts.cgz fonts are named by the map
 	# name as that's unique, font names are not
diff --git a/loader2/lang.c b/loader2/lang.c
index 6aeb67b17..4ff2faa6c 100644
--- a/loader2/lang.c
+++ b/loader2/lang.c
@@ -92,7 +92,7 @@ static void loadLanguageList(int flags) {
                     "/etc/lang-table";
     FILE * f;
     char line[256];
-    char name[256], key[256], font[256], map[256], code[256],
+    char name[256], key[256], font[256], code[256],
          keyboard[256], timezone[256], instlang[256];
     int lineNum = 0;
 
@@ -106,7 +106,7 @@ static void loadLanguageList(int flags) {
     while (fgets(line, sizeof(line), f)) {
         lineNum++;
         languages = realloc(languages, sizeof(*languages) * (numLanguages + 1));
-        if (sscanf(line, "%s %s %s %s %s %s %s %s\n", name, key, font, map,
+        if (sscanf(line, "%s %s %s %s %s %s %s\n", name, key, font, 
                    code, keyboard, timezone, instlang) != 8) {
             logMessage("bad line %d in lang-table", lineNum);
         } else {
diff --git a/textw/language_text.py b/textw/language_text.py
index 44615fa97..a929cac99 100644
--- a/textw/language_text.py
+++ b/textw/language_text.py
@@ -84,23 +84,6 @@ class LanguageWindow:
 
 	instLanguage.setRuntimeLanguage(choice)
                 
-	if not flags.serial:
-	    map = instLanguage.getFontMap(choice)
-	    font = instLanguage.getFontFile(choice)
-	    if map != "None":
-		if os.access("/bin/consolechars", os.X_OK):
-		    iutil.execWithRedirect ("/bin/consolechars",
-					["/bin/consolechars", "-f", font, "-m", map])
-		else:
-		    try:
-			isys.loadFont(map)
-		    except SystemError, (errno, msg):
-			log("Could not load font %s: %s" % (font, msg))
-	    elif os.access("/bin/consolechars", os.X_OK):
-		# test
-		iutil.execWithRedirect ("/bin/consolechars", 
-			["/bin/consolechars", "-d", "-m", "iso01"])
-
 	textInterface.drawFrame()
 	    
         return INSTALL_OK