Delimit language tables with tabs.

4 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 08d828e6b..6e8421b57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2005-03-29  Chris Lumens  <clumens@redhat.com>
 
-	* scripts/getlangnames.py:  Updated for lang-table format change.
+	* language.py (InstallTimeLanguage.__init__):  Split on tabs.
+	* scripts/genlocalelist.py, scripts/getlangnames.py: Updated for
+	lang-table format change.  Also, delimit fields with tabs to make
+	splitting easier.
 
 2005-03-29  Jeremy Katz  <katzj@redhat.com>
 
diff --git a/language.py b/language.py
index 9fc0ecbfc..7f77ca1b5 100644
--- a/language.py
+++ b/language.py
@@ -66,7 +66,7 @@ class InstallTimeLanguage:
             if os.access(path, os.R_OK):
                 f = open(path, 'r')
                 for line in f.readlines():
-                    lang, native = line.split(' ', 1)
+                    lang, native = line.split('\t', 1)
                     native = native.strip()
                     self.nativeLangNames[lang] = native
 
@@ -102,7 +102,7 @@ class InstallTimeLanguage:
 
                 for line in f.readlines():
                     line = string.strip(line)
-                    (nick, map, font, name) = string.split(line, ' ', 3)
+                    (nick, map, font, name) = string.split(line, '\t')
                     self.langInfoByName[name] = (nick, map, font)
 
                 f.close()
diff --git a/scripts/genlocalelist.py b/scripts/genlocalelist.py
index fc56e8b51..32d466304 100755
--- a/scripts/genlocalelist.py
+++ b/scripts/genlocalelist.py
@@ -174,4 +174,4 @@ for name in names:
     map = charmapList[short]
 
     if charMap.has_key(map) and charFont.has_key(map):
-        print "%s %s %s %s" %(short, charMap[map], charFont[map], name)
+        print "%s\t%s\t%s\t%s" %(short, charMap[map], charFont[map], name)
diff --git a/scripts/getlangnames.py b/scripts/getlangnames.py
index 99ebda514..03156d74a 100644
--- a/scripts/getlangnames.py
+++ b/scripts/getlangnames.py
@@ -16,4 +16,4 @@ nameList = names.keys()
 nameList.sort()
 
 for k in nameList:
-    print k, names[k]
+    print "%s\t%s" % (k, names[k])