summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/gettext.texi4
-rw-r--r--intl/ChangeLog5
-rwxr-xr-xintl/config.charset14
-rw-r--r--lib/ChangeLog5
-rwxr-xr-xlib/config.charset14
-rw-r--r--src/po-charset.c8
-rw-r--r--src/write-po.c8
7 files changed, 34 insertions, 24 deletions
diff --git a/doc/gettext.texi b/doc/gettext.texi
index f7a86fa..b5e45ad 100644
--- a/doc/gettext.texi
+++ b/doc/gettext.texi
@@ -2060,7 +2060,7 @@ are limited to those supported by both GNU @code{libc} and GNU
@code{CP932}, @code{CP949}, @code{CP950}, @code{CP1250}, @code{CP1251},
@code{CP1252}, @code{CP1253}, @code{CP1254}, @code{CP1255}, @code{CP1256},
@code{CP1257}, @code{GB2312}, @code{EUC-JP}, @code{EUC-KR}, @code{EUC-TW},
-@code{BIG5}, @code{BIG5HKSCS}, @code{GBK}, @code{GB18030}, @code{SJIS},
+@code{BIG5}, @code{BIG5-HKSCS}, @code{GBK}, @code{GB18030}, @code{SHIFT_JIS},
@code{JOHAB}, @code{TIS-620}, @code{VISCII}, @code{UTF-8}.
@c This data is taken from glibc/localedata/SUPPORTED.
@@ -2089,7 +2089,7 @@ corresponding languages.
@item @code{CP1251} for Bulgarian, Byelorussian,
@item @code{GB2312}, @code{GBK}, @code{GB18030}
for simplified writing of Chinese,
-@item @code{BIG5}, @code{BIG5HKSCS}
+@item @code{BIG5}, @code{BIG5-HKSCS}
for traditional writing of Chinese,
@item @code{EUC-JP} for Japanese,
@item @code{EUC-KR} for Korean,
diff --git a/intl/ChangeLog b/intl/ChangeLog
index fc384de..67551a4 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-24 Bruno Haible <haible@clisp.cons.org>
+
+ * config.charset: Change canonical name of BIG5HKSCS to BIG5-HKSCS.
+ Change canonical name of SJIS to SHIFT_JIS.
+
2001-06-12 Bruno Haible <haible@clisp.cons.org>
* dcigettext.c (DCIGETTEXT): Release the lock before returning.
diff --git a/intl/config.charset b/intl/config.charset
index d6f3695..f4f2611 100755
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -80,10 +80,10 @@
# EUC-KR glibc aix hpux irix osf solaris freebsd yes
# EUC-TW glibc aix hpux irix osf solaris
# BIG5 glibc aix hpux osf solaris freebsd yes
-# BIG5HKSCS glibc
+# BIG5-HKSCS glibc
# GBK aix osf win32 dos
# GB18030 glibc
-# SJIS hpux osf solaris freebsd
+# SHIFT_JIS hpux osf solaris freebsd yes
# JOHAB glibc win32
# TIS-620 glibc aix hpux osf solaris
# VISCII glibc yes
@@ -174,7 +174,7 @@ case "$os" in
echo "eucTW EUC-TW"
echo "hp15CN GB2312"
#echo "ccdc ?" # what is this?
- echo "SJIS SJIS"
+ echo "SJIS SHIFT_JIS"
echo "utf8 UTF-8"
;;
irix*)
@@ -209,7 +209,7 @@ case "$os" in
echo "GBK GBK"
echo "KSC5601 CP949"
echo "sdeckanji EUC-JP"
- echo "SJIS SJIS"
+ echo "SJIS SHIFT_JIS"
echo "TACTIS TIS-620"
echo "UTF-8 UTF-8"
;;
@@ -230,7 +230,7 @@ case "$os" in
echo "cns11643 EUC-TW"
echo "5601 EUC-KR"
echo "eucJP EUC-JP"
- echo "PCK SJIS"
+ echo "PCK SHIFT_JIS"
echo "TIS620.2533 TIS-620"
#echo "sun_eu_greek ?" # what is this?
echo "UTF-8 UTF-8"
@@ -266,8 +266,8 @@ case "$os" in
echo "zh_TW.Big5 BIG5"
echo "zh_CN.EUC GB2312"
echo "ja_JP.EUC EUC-JP"
- echo "ja_JP.SJIS SJIS"
- echo "ja_JP.Shift_JIS SJIS"
+ echo "ja_JP.SJIS SHIFT_JIS"
+ echo "ja_JP.Shift_JIS SHIFT_JIS"
echo "ko_KR.EUC EUC-KR"
;;
beos*)
diff --git a/lib/ChangeLog b/lib/ChangeLog
index fd294b3..cfd8026 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-24 Bruno Haible <haible@clisp.cons.org>
+
+ * config.charset: Change canonical name of BIG5HKSCS to BIG5-HKSCS.
+ Change canonical name of SJIS to SHIFT_JIS.
+
2001-07-01 Bruno Haible <haible@clisp.cons.org>
* utf8-ucs4.h: New file, extracted from linebreak.c.
diff --git a/lib/config.charset b/lib/config.charset
index d6f3695..f4f2611 100755
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -80,10 +80,10 @@
# EUC-KR glibc aix hpux irix osf solaris freebsd yes
# EUC-TW glibc aix hpux irix osf solaris
# BIG5 glibc aix hpux osf solaris freebsd yes
-# BIG5HKSCS glibc
+# BIG5-HKSCS glibc
# GBK aix osf win32 dos
# GB18030 glibc
-# SJIS hpux osf solaris freebsd
+# SHIFT_JIS hpux osf solaris freebsd yes
# JOHAB glibc win32
# TIS-620 glibc aix hpux osf solaris
# VISCII glibc yes
@@ -174,7 +174,7 @@ case "$os" in
echo "eucTW EUC-TW"
echo "hp15CN GB2312"
#echo "ccdc ?" # what is this?
- echo "SJIS SJIS"
+ echo "SJIS SHIFT_JIS"
echo "utf8 UTF-8"
;;
irix*)
@@ -209,7 +209,7 @@ case "$os" in
echo "GBK GBK"
echo "KSC5601 CP949"
echo "sdeckanji EUC-JP"
- echo "SJIS SJIS"
+ echo "SJIS SHIFT_JIS"
echo "TACTIS TIS-620"
echo "UTF-8 UTF-8"
;;
@@ -230,7 +230,7 @@ case "$os" in
echo "cns11643 EUC-TW"
echo "5601 EUC-KR"
echo "eucJP EUC-JP"
- echo "PCK SJIS"
+ echo "PCK SHIFT_JIS"
echo "TIS620.2533 TIS-620"
#echo "sun_eu_greek ?" # what is this?
echo "UTF-8 UTF-8"
@@ -266,8 +266,8 @@ case "$os" in
echo "zh_TW.Big5 BIG5"
echo "zh_CN.EUC GB2312"
echo "ja_JP.EUC EUC-JP"
- echo "ja_JP.SJIS SJIS"
- echo "ja_JP.Shift_JIS SJIS"
+ echo "ja_JP.SJIS SHIFT_JIS"
+ echo "ja_JP.Shift_JIS SHIFT_JIS"
echo "ko_KR.EUC EUC-KR"
;;
beos*)
diff --git a/src/po-charset.c b/src/po-charset.c
index 84ac634..14f8cfe 100644
--- a/src/po-charset.c
+++ b/src/po-charset.c
@@ -74,10 +74,10 @@ po_charset_canonicalize (charset)
"EUC-KR",
"EUC-TW",
"BIG5",
- "BIG5HKSCS",
+ "BIG5-HKSCS",
"GBK",
"GB18030",
- "SJIS",
+ "SHIFT_JIS",
"JOHAB",
"TIS-620",
"VISCII",
@@ -157,10 +157,10 @@ Message conversion to user's charset might not work.\n"),
static const char *weird_charsets[] =
{
"BIG5",
- "BIG5HKSCS",
+ "BIG5-HKSCS",
"GBK",
"GB18030",
- "SJIS",
+ "SHIFT_JIS",
"JOHAB"
};
const char *envval;
diff --git a/src/write-po.c b/src/write-po.c
index 0f9af6c..5274d2b 100644
--- a/src/write-po.c
+++ b/src/write-po.c
@@ -266,8 +266,8 @@ wrap (fp, line_prefix, name, value, do_wrap, charset)
{
/* Skip over a complete multi-byte character. Don't
interpret the second byte of a multi-byte character as
- ASCII. This is needed for the BIG5, BIG5HKSCS, GBK,
- GB18030, SJIS, JOHAB encodings. */
+ ASCII. This is needed for the BIG5, BIG5-HKSCS, GBK,
+ GB18030, SHIFT_JIS, JOHAB encodings. */
char scratchbuf[64];
const char *inptr = ep;
size_t insize;
@@ -348,8 +348,8 @@ internationalized messages should not contain the `\\%c' escape sequence"),
{
/* Copy a complete multi-byte character. Don't
interpret the second byte of a multi-byte character as
- ASCII. This is needed for the BIG5, BIG5HKSCS, GBK,
- GB18030, SJIS, JOHAB encodings. */
+ ASCII. This is needed for the BIG5, BIG5-HKSCS, GBK,
+ GB18030, SHIFT_JIS, JOHAB encodings. */
char scratchbuf[64];
const char *inptr = ep;
size_t insize;
generated by cgit v1.1 at 2024-09-13 10:06:25 +0000