From 66036a902d8633015a51c288b0dd06fe8f8eea67 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 24 Feb 2023 18:53:13 +0000
Subject: [PATCH] i18n: Rename language to locale

This is actually what we ask the user to select

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/python/__init__.py |  2 +-
 src/python/i18n.py     |  7 ++++---
 src/python/step.py     | 14 ++++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/python/__init__.py b/src/python/__init__.py
index cabb9cd..67ddb27 100644
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -61,7 +61,7 @@ class Bricklayer(object):
 
 		# Settings
 		self.settings = {
-			"language" : i18n.default_language,
+			"locale" : i18n.DEFAULT_LOCALE,
 
 			"packages" : [
 				"system-release",
diff --git a/src/python/i18n.py b/src/python/i18n.py
index 0e36e36..3dce227 100644
--- a/src/python/i18n.py
+++ b/src/python/i18n.py
@@ -20,14 +20,15 @@
 
 import gettext
 
-supported_languages = {
+SUPPORTED_LOCALES = {
 	"de_DE.UTF-8" : "Deutsch",
 	"en_US.UTF-8" : "English (United States)",
 }
 
-default_language = "en_US.UTF-8"
+DEFAULT_LOCALE = "en_US.UTF-8"
 
-assert default_language in supported_languages
+# Check if the default locale is supported
+assert DEFAULT_LOCALE in SUPPORTED_LOCALES, "DEFAULT_LOCALE is not supported"
 
 N_ = lambda x: x
 
diff --git a/src/python/step.py b/src/python/step.py
index 1331ae4..49726ef 100644
--- a/src/python/step.py
+++ b/src/python/step.py
@@ -138,23 +138,25 @@ class Welcome(InteractiveStep):
 
 	def run(self):
 		name = self.bricklayer.os.get("NAME")
-		current_language = self.bricklayer.settings.get("language")
+
+		# Fetch the currently selected locale
+		locale = self.bricklayer.settings.get("locale", i18n.DEFAULT_LOCALE)
 
 		# Let the user select
-		lang = self.tui.select(
+		locale = self.tui.select(
 			_("Willkommen, Bienvenue, Welcome!"),
 			_("Select the language you wish to use for the installation"),
-			i18n.supported_languages, default=current_language,
+			i18n.SUPPORTED_LOCALES, default=locale,
 			buttons=[_("Start Installation")], width=60,
 		)
 
-		log.info("Language selected: %s" % lang)
+		log.info("Locale selected: %s" % locale)
 
 		# Store in settings
-		self.bricklayer.settings["language"] = lang
+		self.bricklayer.settings["locale"] = locale
 
 		# Set to environment
-		os.environ["LANGUAGE"] = lang
+		os.environ["LANGUAGE"] = locale
 
 
 class Congratulations(Step):
-- 
2.47.3