fix for fonts from jj

3 files changed, 8 insertions, 7 deletions

diff --git a/lang-table b/lang-table
index 74caa9bc0..36b548d3a 100644
--- a/lang-table
+++ b/lang-table
@@ -9,11 +9,11 @@ Italian		it	lat0-sun16	iso15		it_IT
 Norwegian	no	lat0-sun16	iso15		no_NO 
 Polish		pl	lat2-sun16 	iso02		pl_PL
 Romanian	ro	lat2-sun16	iso02		ro_RO 
-Russian 	ru 	Cyr_a8x16 	Cyr_a		ru_RU.KOI8-R 
+Russian 	ru 	cyr-sun16 	koi8-r		ru_RU.KOI8-R 
 Serbian		sr	lat2-sun16	iso02		sr_YU 
 Slovak		sk	lat2-sun16	iso02		sk_SK 
 Slovenian	sl	lat2-sun16	iso02		sl_SI 
 Spanish		es	None		None		es_ES
 Swedish 	sv	lat0-sun16	iso15		sv_SV
 Turkish		tr	lat5-sun16 	iso09		tr_TR 
-Ukranian 	uk 	koi8u_8x16 	koi8u		uk_UA.KOI8-U
+Ukrainian 	uk 	cyr-sun16 	koi8-u		uk_UA.KOI8-U
diff --git a/loader/lang.c b/loader/lang.c
index 306c2ae82..ca0948770 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -187,6 +187,7 @@ static int loadFont(char * fontFile, int flags) {
     gzFile stream;
     int rc;
 
+    if (!strcmp(fontFile, "None")) return 0;
 #if 0
     if (!FL_TESTING(flags)) {
 #endif
@@ -239,8 +240,8 @@ void setLanguage (char * key) {
 	    setenv("LC_ALL", languages[i].lc_all, 1);
 	    setenv("LINGUAS", languages[i].key, 1);
 	    loadLanguage (NULL, 0);
-	    if (languages[i].font)
-		loadFont(languages[i].font, 0);
+	    if (languages[i].map)
+		loadFont(languages[i].map, 0);
 	    break;
 	}
     }
@@ -300,8 +301,8 @@ int chooseLanguage(char ** lang, int flags) {
     }
 
     loadLanguage (NULL, flags);
-    if (languages[choice].font)
-	loadFont(languages[choice].font, flags);
+    if (languages[choice].map)
+	loadFont(languages[choice].map, flags);
 
     return 0;
 }
diff --git a/todo.py b/todo.py
index 4838e729d..01f41cc64 100644
--- a/todo.py
+++ b/todo.py
@@ -211,7 +211,7 @@ class Language (SimpleConfigFile):
 	    string.strip(line)
 	    l = string.split(line)
 	    self.langs[l[0]] = l[4]
-	    self.font[l[0]] = l[2]
+	    self.font[l[0]] = l[3]
 	
         # kickstart needs this
         self.abbrevMap = {}