1 |
commit 40e9f12f726fe72374172fae103673da7387ca98 |
2 |
Author: Bill Nottingham <notting@redhat.com> |
3 |
Date: Fri Jun 24 10:03:11 2011 -0400 |
4 |
|
5 |
Make sure we override LANG if we're being run from xinit/startx (#713988, <tatsu@ab.jp.nec.com>) |
6 |
|
7 |
diff --git a/lang.sh b/lang.sh |
8 |
index cf02a61..bd798a1 100755 |
9 |
--- a/lang.sh |
10 |
+++ b/lang.sh |
11 |
@@ -2,7 +2,9 @@ |
12 |
|
13 |
sourced=0 |
14 |
|
15 |
-if [ -n "$LANG" ]; then |
16 |
+# $sysxkbmap means we're running under Xinit; we want to re-read settings in case |
17 |
+# we're running in CJKI and have been defaulted to English on the console. |
18 |
+if [ -z "$sysxkbmap" -a -n "$LANG" ]; then |
19 |
sourced=1 |
20 |
else |
21 |
for langfile in /etc/sysconfig/i18n $HOME/.i18n ; do |