lang: Make the language selection work

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/python/__init__.py b/src/python/__init__.py
index e87e197b95e845ed6563446e78792fd12f1dcdc4..ae90b5623cf22d4ea6d56ca37f97f5e1043248f8 100644 (file)
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -41,6 +41,11 @@ class Bricklayer(object):
                if debug:
                        log.setLevel(logging.DEBUG)
 
+               # Settings
+               self.settings = {
+                       "language" : lang.default_language,
+               }
+
                # Hardware
                self.disks = disk.Disks(self)
 

diff --git a/src/python/lang.py b/src/python/lang.py
index b8c71a0bc997572a0f5093d1615fe20d50ab965a..74abc5b050bd5997ad7f24788f6a48159f38cc2a 100644 (file)
--- a/src/python/lang.py
+++ b/src/python/lang.py
@@ -46,18 +46,7 @@ class SelectLanguage(step.Step):
                return not self.bricklayer.unattended
 
        def initialize(self):
-               self.current_language = self._guess_language()
-
-       def _guess_language(self):
-               """
-                       Guesses the selected language from the environment
-               """
-               for param in ("LANGUAGE", "LANG", "LC_ALL"):
-                       lang = os.environ.get(param, None)
-                       if lang and lang in supported_languages:
-                               return lang
-
-               return default_language
+               self.current_language = self.bricklayer.settings.get("language")
 
        def run(self, tui):
                # Let the user select
@@ -68,3 +57,9 @@ class SelectLanguage(step.Step):
                )
 
                log.info("Language selected: %s" % code)
+
+               # Store in settings
+               self.bricklayer.settings["language"] = code
+
+               # Set to environment
+               os.environ["LANGUAGE"] = code