From d58c5be1dd55c4809f57176db3dec2380d5ada2b Mon Sep 17 00:00:00 2001
From: fatalerrors <geoffray.levasseurbrandin@numericable.fr>
Date: Wed, 2 Jun 2021 15:23:12 +0200
Subject: [PATCH] added locale module and deps

---
 conf/init.conf.sh        |  2 +-
 init.sh                  |  7 -------
 modules/#conf_locale.sh# | 22 ++++++++++++++++++++++
 modules/.#conf_locale.sh |  1 +
 modules/conf_locale.sh   | 19 +++++++++++++++++++
 5 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 modules/#conf_locale.sh#
 create mode 120000 modules/.#conf_locale.sh
 create mode 100644 modules/conf_locale.sh

diff --git a/conf/init.conf.sh b/conf/init.conf.sh
index 94f52b0..68df0d0 100644
--- a/conf/init.conf.sh
+++ b/conf/init.conf.sh
@@ -20,4 +20,4 @@ export FORCEBLANK="no"
 
 # ------------------------------------------------------------------------------
 
-export MODULE_LIST="upgrade_dist conf_disks"
+export MODULE_LIST="upgrade_dist conf_disks conf_locale"
diff --git a/init.sh b/init.sh
index 104b851..73eadf6 100755
--- a/init.sh
+++ b/init.sh
@@ -35,13 +35,6 @@ export LOGFILE=${LOGFILE:-"/var/log/$(uname -n)-$(date +%Y%m%d-%H%M).log"}
 #    echo "+kroot::::::::" >> /etc/shadow
 #}
 
-# Locale
-conf_locale()
-{
-    backupdist /etc/locale.gen
-    sed -i "/^# en_US.UTF-8 /s/^# //" /etc/locale.gen
-    locale-gen
-}
 
 # Additionnal packages (some are necessary to that script to end successfully)
 install_pkg()
diff --git a/modules/#conf_locale.sh# b/modules/#conf_locale.sh#
new file mode 100644
index 0000000..3b7a95e
--- /dev/null
+++ b/modules/#conf_locale.sh#
@@ -0,0 +1,22 @@
+# Locale
+
+conf_locale()
+{
+    backupdist /etc/locale.gen
+    for loc in $LOCALESET; do
+	prnt I "Activation de la locale ${loc}..."
+	sed -i "/^# $loc /s/^# //" /etc/locale.gen
+    done
+    prnt I "Régénération du cache de locale..."
+    locale-gen
+}
+
+precheck_conf_locale()
+{
+    if [[ ! $LOCALESET ]]; then
+	prnt W "Aucune locale définie !"
+    fi
+}
+
+export -f conf_locale
+export -f precheck_conf_locale
\ No newline at end of file
diff --git a/modules/.#conf_locale.sh b/modules/.#conf_locale.sh
new file mode 120000
index 0000000..e38ed69
--- /dev/null
+++ b/modules/.#conf_locale.sh
@@ -0,0 +1 @@
+fatalerrors@isarog.240485:1622181080
\ No newline at end of file
diff --git a/modules/conf_locale.sh b/modules/conf_locale.sh
new file mode 100644
index 0000000..f19b22d
--- /dev/null
+++ b/modules/conf_locale.sh
@@ -0,0 +1,19 @@
+# Locale
+
+conf_locale()
+{
+    backupdist /etc/locale.gen
+    for loc in $LOCALESET; do
+	prnt I "Activation de la locale ${loc}..."
+	sed -i "/^# $loc /s/^# //" /etc/locale.gen
+    done
+    prnt I "Régénération du cache de locale..."
+    locale-gen
+}
+
+precheck_conf_locale()
+{
+    if [[ ! $LOCALESET ]]; then
+	prnt W "Aucune locale définie !"
+    fi
+}