diff options
-rw-r--r-- | NEWS | 2 | ||||
-rwxr-xr-x | draklive-install.xsetup | 11 |
2 files changed, 12 insertions, 1 deletions
@@ -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 |