summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2015-02-08 18:34:46 +0000
committerColin Guthrie <colin@mageia.org>2015-02-08 18:38:27 +0000
commit4ba178362821f07389848939a29d017dbc580285 (patch)
tree66453a6df60eb360a485c17ed9bf57aaa15960da
parent18fcb087268c6bbd1efaff9cd60cdcb56016ae2f (diff)
downloaddraklive-install-4ba178362821f07389848939a29d017dbc580285.tar
draklive-install-4ba178362821f07389848939a29d017dbc580285.tar.gz
draklive-install-4ba178362821f07389848939a29d017dbc580285.tar.bz2
draklive-install-4ba178362821f07389848939a29d017dbc580285.tar.xz
draklive-install-4ba178362821f07389848939a29d017dbc580285.zip
i18n: ensure preferred locale.conf is read (over sysconfig/i18n)
-rw-r--r--NEWS2
-rwxr-xr-xdraklive-install.xsetup11
2 files changed, 12 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5ad910d..ccaf3ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- i18n: ensure preferred locale.conf is read (over sysconfig/i18n)
+
2.2
- Mageia 5 design
- translation updates
diff --git a/draklive-install.xsetup b/draklive-install.xsetup
index e6df573..812612c 100755
--- a/draklive-install.xsetup
+++ b/draklive-install.xsetup
@@ -1,7 +1,16 @@
#!/bin/sh
# to be sourced
if grep -q '\binstall\b' /proc/cmdline; then
- . /etc/sysconfig/i18n
+ if [ -r /etc/locale.conf -o -r /etc/sysconfig/i18n ]; then
+ unset LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+ LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \
+ LC_IDENTIFICATION
+ if [ -r /etc/locale.conf ]; then
+ . /etc/locale.conf
+ else
+ . /etc/sysconfig/i18n
+ fi
+ fi
/usr/sbin/draklive-install
reboot
fi