From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 5 May 2021 21:16:06 +0000 (+0000)
Subject: lang: Make the language selection work
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=287d78f1eb7913197608f2ff22687c87bc38fe26;p=people%2Fms%2Fbricklayer.git

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 e87e197..ae90b56 100644
--- 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 b8c71a0..74abc5b 100644
--- 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