locale: C -> en_US

2 files changed, 13 insertions, 4 deletions

diff --git a/lang.csh b/lang.csh
index dde51a01..49cc41e7 100755
--- a/lang.csh
+++ b/lang.csh
@@ -2,7 +2,7 @@
 
 test -f /etc/sysconfig/i18n
 if ($status == 0) then
-    cat /etc/sysconfig/i18n | sed "s|=| |g" | sed "s|^\([^#]\)|setenv \0|g" > /tmp/csh.$$
+    sed "s|=C$|=en_US|g" /etc/sysconfig/i18n | sed "s|=| |g"  | sed "s|^\([^#]\)|setenv \0|g" > /tmp/csh.$$
     source /tmp/csh.$$
     rm -f /tmp/csh.$$
 
diff --git a/lang.sh b/lang.sh
index f6d6a44f..5d28ed1d 100755
--- a/lang.sh
+++ b/lang.sh
@@ -2,16 +2,25 @@
 
 if [ -f /etc/sysconfig/i18n ]; then
     . /etc/sysconfig/i18n
-    [ -n "$LANG" ] && export LANG || unset LANG
+    if [ -n "$LANG" ] ; then
+       [ "$LANG" = "C" ] && LANG="en_US"
+       export LANG || unset LANG
+    fi
     [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
     [ -n "$LC_COLLATE" ] && export LC_COLLATE || unset LC_COLLATE
     [ -n "$LC_MESSAGES" ] && export LC_MESSAGES || unset LC_MESSAGES
     [ -n "$LC_NUMERIC" ] && export LC_NUMERIC || unset LC_NUMERIC
     [ -n "$LC_MONETARY" ] && export LC_MONETARY || unset LC_MONETARY
     [ -n "$LC_TIME" ] && export LC_TIME || unset LC_TIME
-    [ -n "$LC_ALL" ] && export LC_ALL || unset LC_ALL
+    if [ -n "$LC_ALL" ]; then
+       [ "$LC_ALL" = "C" ] && LC_ALL="en_US"
+       export LC_ALL || unset LC_ALL
+    fi
     [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
-    [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
+    if [ -n "$LINGUAS" ]; then
+       [ "$LINGUAS" = "C" ] && LINGUAS="en_US"
+       export LINGUAS || unset LINGUAS
+    fi
     [ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
 
     if [ -n "$SYSFONTACM" ]; then