diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | instdata.py | 2 | ||||
-rw-r--r-- | language.py | 19 | ||||
-rw-r--r-- | scripts/getlangnames.py | 2 |
4 files changed, 20 insertions, 12 deletions
@@ -1,5 +1,14 @@ 2005-03-31 Chris Lumens <clumens@redhat.com> + * language.py (InstallTimeLanguage.__init__): Set default language + settings so we get a useful /etc/sysconfig/i18n on manual installs + (#149688). + * language.py (InstallTimeLanguage.__init__): Fix time zones. + + * language.py: Renamed class to Language. + * instdata.py: Likewise. + * scripts/getlangnames.py: Likewise. + * iw/network_gui.py (NetworkWindow.setHostOptionsSensitivity): Make sure automatic hostname option isn't greyed out when using a static IP for installation (#149116). diff --git a/instdata.py b/instdata.py index 3d9fb6165..e75f448e8 100644 --- a/instdata.py +++ b/instdata.py @@ -248,7 +248,7 @@ class InstallData: f.write("-%s\n" %(pkg.name)) def __init__(self, extraModules, floppyDevice, methodstr): - self.instLanguage = language.InstallTimeLanguage() + self.instLanguage = language.Language() self.keyboard = keyboard.Keyboard() self.mouse = None diff --git a/language.py b/language.py index a9a7fb2ca..82bb51a7b 100644 --- a/language.py +++ b/language.py @@ -39,10 +39,7 @@ def expandLangs(astring): return langs -# XXX: The following description is going to be wrong soon. -# This is the langauge that's being used at install time (a list of the -# choices is in lang-table). -class InstallTimeLanguage: +class Language: def __init__ (self): self.info = {} self.info["SUPPORTED"] = None @@ -89,7 +86,7 @@ class InstallTimeLanguage: if len(l) < 6: continue - self.localeInfo[l[3]] = (l[0], l[1], l[2], l[4], l[5]) + self.localeInfo[l[3]] = (l[0], l[1], l[2], l[4], string.strip(l[5])) f.close() @@ -115,6 +112,8 @@ class InstallTimeLanguage: # Set the language for anaconda to be using based on current $LANG. self.setRuntimeLanguage(self.current) + self.setDefault(self.current) + self.setSupported([self.getLangNameByNick(self.current)]) # Convert what might be a shortened form of a language's nick (en or # en_US, for example) into the full version (en_US.UTF-8). @@ -216,19 +215,19 @@ class InstallTimeLanguage: if lang == "zh_CN.GB18030": self.info['LANGUAGE'] = "zh_CN.GB18030:zh_CN.GB2312:zh_CN" - def setSupported (self, langlist): - if len(langlist) == len(self.allSupportedLangs): + def setSupported (self, namelist): + if len(namelist) == len(self.allSupportedLangs): self.info["SUPPORTED"] = None self.supported = self.getAllSupported() - elif langlist: + elif namelist: rpmNickList = [] - for name in langlist: + for name in namelist: nick = self.getNickByName(name) rpmNickList = rpmNickList + expandLangs(nick) linguas = string.join (rpmNickList, ':') self.info["SUPPORTED"] = linguas - self.supported = langlist + self.supported = namelist shortLinguas = string.join (rpmNickList, ':') else: diff --git a/scripts/getlangnames.py b/scripts/getlangnames.py index 03156d74a..186ec4dfd 100644 --- a/scripts/getlangnames.py +++ b/scripts/getlangnames.py @@ -6,7 +6,7 @@ import language rhpl.translate.cat.setunicode(1) -langs = language.InstallTimeLanguage() +langs = language.Language() names = {} for k in langs.localeInfo.keys(): langs.setRuntimeLanguage(k) |