summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--unix/tclUnixInit.c7
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d95c1be..96ab508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-01-05 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+ * unix/tclUnixInit.c (localeTable): Add encoding mappings for some
+ Chinese locales. [Bug 1084595]
+
* doc/lsearch.n: Convert to other form of emacs mode control
comment to prevent problems with old versions of man. [Bug 1085127]
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index a3add18..0c6fbe9 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -7,7 +7,7 @@
* Copyright (c) 1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.5 2004/11/19 06:29:25 das Exp $
+ * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.6 2005/01/05 22:14:43 dkf Exp $
*/
#if defined(HAVE_CFBUNDLE)
@@ -136,6 +136,11 @@ static CONST LocaleTable localeTable[] = {
{"ru_SU", "iso8859-5"},
{"zh", "cp936"},
+ {"zh_CN.gb2312", "euc-cn"},
+ {"zh_CN.GB2312", "euc-cn"},
+ {"zh_CN.GBK", "euc-cn"},
+ {"zh_TW.Big5", "big5"},
+ {"zh_TW", "euc-tw"},
{NULL, NULL}
};