1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
#! /bin/sh -e
# DP: * Lib/locale.py:
# DP: - correctly parse LANGUAGE as a colon separated list of languages.
# DP: - prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE to get the correct
# DP: encoding.
# DP: - Don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding
# DP: for glibc.
dir=
if [ $# -eq 3 -a "$2" = '-d' ]; then
pdir="-d $3"
dir="$3/"
elif [ $# -ne 1 ]; then
echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
exit 1
fi
case "$1" in
-patch)
patch $pdir -f --no-backup-if-mismatch -p0 < $0
#cd ${dir}gcc && autoconf
;;
-unpatch)
patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
#rm ${dir}gcc/configure
;;
*)
echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
exit 1
esac
exit 0
--- Lib/locale.py~ 2004-07-26 14:45:59.000000000 +0200
+++ Lib/locale.py 2005-03-20 14:13:54.741737088 +0100
@@ -295,7 +295,7 @@
else:
return language + '.' + encoding
-def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')):
+def getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')):
""" Tries to determine the default locale settings and returns
them as tuple (language code, encoding).
@@ -340,6 +340,8 @@
for variable in envvars:
localename = lookup(variable,None)
if localename:
+ if variable == 'LANGUAGE':
+ localename = localename.split(':')[0]
break
else:
localename = 'C'
@@ -463,9 +465,9 @@
'ajec': 'eucJP',
'eucjp': 'eucJP',
'ujis': 'eucJP',
- 'utf-8': 'utf',
- 'utf8': 'utf',
- 'utf8@ucs4': 'utf',
+ 'utf': 'utf-8',
+ 'utf8': 'utf-8',
+ 'utf8@ucs4': 'utf-8',
}
#
@@ -650,8 +652,8 @@
'tr': 'tr_TR.ISO8859-9',
'tr_tr': 'tr_TR.ISO8859-9',
'turkish': 'tr_TR.ISO8859-9',
- 'univ': 'en_US.utf',
- 'universal': 'en_US.utf',
+ 'univ': 'en_US.utf-8',
+ 'universal': 'en_US.utf-8',
'zh': 'zh_CN.eucCN',
'zh_cn': 'zh_CN.eucCN',
'zh_cn.big5': 'zh_TW.eucTW',
|
