Add more Windows codepage numbers.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 9f3127546ad96b3c4ff980cfe6b2775d708b06fd..63fc7bb4e9aca4ddddd6f94c427309ae129f7bdc 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-02  Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c (get_charset_aliases) [WIN32]: Add CP65001 and others.
+       Reported by <mus1876@gmx.info> via Alain Bench <messtic@oreka.com>.
+
 2005-05-05  Bruno Haible  <bruno@clisp.org>
 
        Make libintl multithread-safe outside glibc.

diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index 1252f3fd8b8d1b7a8f83291b5c1ef660f1e6da54..ffc5969e63d7ce5bf2a463bb15dc096dba175b9e 100644 (file)
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2004 Free Software Foundation, Inc.
+   Copyright (C) 2000-2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -249,6 +249,7 @@ get_charset_aliases ()
           "CP1361" "\0" "JOHAB" "\0"
           "CP20127" "\0" "ASCII" "\0"
           "CP20866" "\0" "KOI8-R" "\0"
+          "CP20936" "\0" "GB2312" "\0"
           "CP21866" "\0" "KOI8-RU" "\0"
           "CP28591" "\0" "ISO-8859-1" "\0"
           "CP28592" "\0" "ISO-8859-2" "\0"
@@ -259,7 +260,14 @@ get_charset_aliases ()
           "CP28597" "\0" "ISO-8859-7" "\0"
           "CP28598" "\0" "ISO-8859-8" "\0"
           "CP28599" "\0" "ISO-8859-9" "\0"
-          "CP28605" "\0" "ISO-8859-15" "\0";
+          "CP28605" "\0" "ISO-8859-15" "\0"
+          "CP38598" "\0" "ISO-8859-8" "\0"
+          "CP51932" "\0" "EUC-JP" "\0"
+          "CP51936" "\0" "GB2312" "\0"
+          "CP51949" "\0" "EUC-KR" "\0"
+          "CP51950" "\0" "EUC-TW" "\0"
+          "CP54936" "\0" "GB18030" "\0"
+          "CP65001" "\0" "UTF-8" "\0";
 # endif
 #endif
 

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index a0693a0e6e1607a58b6435633dcb64ad55142704..5112132aa38c9936db1d4b89fa07180f61f2b585 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-02  Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c (get_charset_aliases) [WIN32]: Add CP65001 and others.
+       Reported by <mus1876@gmx.info> via Alain Bench <messtic@oreka.com>.
+
 2005-06-08  Bruno Haible  <bruno@clisp.org>
 
        * canonicalize.c (__realpath): Avoid gcc warnings on platforms that

diff --git a/gettext-tools/lib/localcharset.c b/gettext-tools/lib/localcharset.c
index 1252f3fd8b8d1b7a8f83291b5c1ef660f1e6da54..ffc5969e63d7ce5bf2a463bb15dc096dba175b9e 100644 (file)
--- a/gettext-tools/lib/localcharset.c
+++ b/gettext-tools/lib/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2004 Free Software Foundation, Inc.
+   Copyright (C) 2000-2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -249,6 +249,7 @@ get_charset_aliases ()
           "CP1361" "\0" "JOHAB" "\0"
           "CP20127" "\0" "ASCII" "\0"
           "CP20866" "\0" "KOI8-R" "\0"
+          "CP20936" "\0" "GB2312" "\0"
           "CP21866" "\0" "KOI8-RU" "\0"
           "CP28591" "\0" "ISO-8859-1" "\0"
           "CP28592" "\0" "ISO-8859-2" "\0"
@@ -259,7 +260,14 @@ get_charset_aliases ()
           "CP28597" "\0" "ISO-8859-7" "\0"
           "CP28598" "\0" "ISO-8859-8" "\0"
           "CP28599" "\0" "ISO-8859-9" "\0"
-          "CP28605" "\0" "ISO-8859-15" "\0";
+          "CP28605" "\0" "ISO-8859-15" "\0"
+          "CP38598" "\0" "ISO-8859-8" "\0"
+          "CP51932" "\0" "EUC-JP" "\0"
+          "CP51936" "\0" "GB2312" "\0"
+          "CP51949" "\0" "EUC-KR" "\0"
+          "CP51950" "\0" "EUC-TW" "\0"
+          "CP54936" "\0" "GB18030" "\0"
+          "CP65001" "\0" "UTF-8" "\0";
 # endif
 #endif