← Back to branch summary

~ubuntu-branches/ubuntu/raring/gdm/raring

« back to all changes in this revision

Viewing changes to data/Xsession.in

  • Committer: Package Import Robot
  • Author(s): Gunnar Hjalmarsson
  • Date: 2012-01-31 17:45:20 UTC
  • Revision ID: package-import@ubuntu.com-20120131174520-5y15hrfu5v9e6orf
Tags: 3.0.4-0ubuntu15
* debian/patches/45_time_display_on_greeter.patch:
  - Adapt to forwarded version of the patch.
  - Let the LANG environment variable serve as fallback when
    determining the display language for the weekday, since LANG
    has been redefined in Ubuntu to represent language instead of
    regional formats. This change also ought to make the patch work
    as intended upstream.
* debian/gdm.upstart:
  - No need to export LC_MESSAGES since it's not set any longer.
* debian/patches/ubuntu_no_LANG_setting_in_Xsession.patch:
  - Renamed from "ubuntu_i18n_oneiric.patch".
  - No need to unset LC_MESSAGES etc. since they are not set any
    longer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Xsession.in
36
36
test -f /etc/xprofile && . /etc/xprofile
37
37
test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
38
38
 
39
 
# unset certain LC_* variables if they equal LANG
40
 
if [ $LANG != ${LANG%.utf8*} ]; then
41
 
    x_lang=${LANG%.*}.UTF-8${LANG#*.utf8}
42
 
else
43
 
    x_lang=${LANG%.*}.utf8${LANG#*.UTF-8}
44
 
fi
45
 
env_var_unset() {
46
 
    local name=$1
47
 
    local val=$2
48
 
    if [ -n "$val" ] && [ $val != $LANG -a $val != $x_lang ]; then
49
 
        return
50
 
    fi
51
 
    unset $name
52
 
}
53
 
env_var_unset 'LC_MESSAGES' $LC_MESSAGES
54
 
env_var_unset 'LC_CTYPE' $LC_CTYPE
55
 
env_var_unset 'LC_COLLATE' $LC_COLLATE
56
 
 
57
39
# Translation stuff
58
40
if [ -x "@libexecdir@/gdmtranslate" ] ; then
59
41
  gdmtranslate="@libexecdir@/gdmtranslate"