diff options
| -rw-r--r-- | dispatch.py | 5 | ||||
| -rwxr-xr-x | gui.py | 2 | ||||
| -rw-r--r-- | installclass.py | 2 | ||||
| -rw-r--r-- | language.py | 6 | ||||
| -rw-r--r-- | text.py | 4 |
5 files changed, 5 insertions, 14 deletions
diff --git a/dispatch.py b/dispatch.py index 0b3bb5e00..9cf3e6d15 100644 --- a/dispatch.py +++ b/dispatch.py @@ -88,10 +88,7 @@ installSteps = [ ("networkdevicecheck", networkDeviceCheck, ("id.network", "dispatch")), ("network", ("id.network", "dispatch", "intf")), ("firewall", ("intf", "id.network", "id.firewall")), -# -# XXXX - we're removing the language support screen -# -# ("languagesupport", ("id.langSupport",)), + ("languagesupport", ("id.langSupport",)), ("timezone", ("id.instLanguage", "id.timezone")), ("accounts", ("id.rootPassword", "id.accounts")), ("authentication", ("id.auth",)), @@ -51,7 +51,7 @@ stepToClass = { "upgbootloader": ("upgrade_bootloader_gui", "UpgradeBootloaderWindow"), "network" : ("network_gui", "NetworkWindow"), "firewall" : ("firewall_gui", "FirewallWindow"), -# "languagesupport" : ("language_support_gui", "LanguageSupportWindow"), + "languagesupport" : ("language_support_gui", "LanguageSupportWindow"), "timezone" : ("timezone_gui", "TimezoneWindow"), "accounts" : ("account_gui", "AccountWindow"), "authentication" : ("auth_gui", "AuthWindow"), diff --git a/installclass.py b/installclass.py index 6fcfcabd4..15e4375e8 100644 --- a/installclass.py +++ b/installclass.py @@ -97,7 +97,7 @@ class BaseInstallClass: "networkdevicecheck", "network", "firewall", -# "languagesupport", + "languagesupport", "timezone", "accounts", "authentication", diff --git a/language.py b/language.py index cf4f0d8fc..2d5d062e0 100644 --- a/language.py +++ b/language.py @@ -204,9 +204,6 @@ class Language (SimpleConfigFile): self.langInfoByName = langInfoByName self.allSupportedLangs = allSupportedLangs - # XXX hack since we don't really use language support anymore - self.setSupported(self.allSupportedLangs) - def getAllSupported(self): return self.allSupportedLangs @@ -287,9 +284,6 @@ class Language (SimpleConfigFile): os.environ ["LINGUAS"] = "" def write(self, instPath): - # XXX hack since we don't actually use the supported aspects anymore - self.setDefault(self.getDefault()) - f = open(instPath + "/etc/sysconfig/i18n", "w") f.write(str (self)) f.close() @@ -57,8 +57,8 @@ stepToClasses = { "BootloaderLocationWindow")), "network" : ("network_text", ("NetworkWindow", "HostnameWindow")), "firewall" : ("firewall_text", "FirewallWindow"), -# "languagesupport" : ("language_text", ("LanguageSupportWindow", -# "LanguageDefaultWindow")), + "languagesupport" : ("language_text", ("LanguageSupportWindow", + "LanguageDefaultWindow")), "timezone" : ("timezone_text", "TimezoneWindow"), "accounts" : ("userauth_text", ("RootPasswordWindow", "UsersWindow")), "authentication" : ("userauth_text", ("AuthConfigWindow")), |