1
Description: Adapt to the Oneiric model for setting languages/locales.
3
Author: Gunnar Hjalmarsson <ubuntu@gunnar.cc>
5
diff -Nur -x '*.orig' -x '*~' gdm-3.0.4//data/Xsession.in gdm-3.0.4.new//data/Xsession.in
6
--- gdm-3.0.4//data/Xsession.in 2011-08-09 14:58:58.000000000 +0200
7
+++ gdm-3.0.4.new//data/Xsession.in 2011-08-09 14:59:12.639636230 +0200
9
test -f /etc/xprofile && . /etc/xprofile
10
test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
12
+# unset certain LC_* variables if they equal LANG
13
+if [ $LANG != ${LANG%.utf8*} ]; then
14
+ x_lang=${LANG%.*}.UTF-8${LANG#*.utf8}
16
+ x_lang=${LANG%.*}.utf8${LANG#*.UTF-8}
21
+ if [ -n "$val" ] && [ $val != $LANG -a $val != $x_lang ]; then
26
+env_var_unset 'LC_MESSAGES' $LC_MESSAGES
27
+env_var_unset 'LC_CTYPE' $LC_CTYPE
28
+env_var_unset 'LC_COLLATE' $LC_COLLATE
31
if [ -x "@libexecdir@/gdmtranslate" ] ; then
32
gdmtranslate="@libexecdir@/gdmtranslate"
37
-# Overwrite $LANG from /etc/profile (and friends) with the one picked in the
39
-if [ -n "$GDM_LANG" ]; then
44
# run all system xinitrc shell scripts.
45
if [ -d /etc/X11/xinit/xinitrc.d ]; then
46
for i in /etc/X11/xinit/xinitrc.d/* ; do