From 80146ab3f7fcbb4bb0bf5919a013daf12ddf1655 Mon Sep 17 00:00:00 2001 From: Eric Mader Date: Wed, 9 Aug 2006 20:13:18 +0000 Subject: [PATCH] ICU-5310 Fix bogus language codes returned by getlanguage() methods. X-SVN-Rev: 20007 --- icu4c/source/i18n/csrmbcs.cpp | 6 +++--- icu4c/source/i18n/csrsbcs.cpp | 7 ++++++- icu4c/source/i18n/csrsbcs.h | 4 +++- icu4c/source/test/testdata/csdetest.xml | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/icu4c/source/i18n/csrmbcs.cpp b/icu4c/source/i18n/csrmbcs.cpp index a070e8b4add..7db29e1e41a 100644 --- a/icu4c/source/i18n/csrmbcs.cpp +++ b/icu4c/source/i18n/csrmbcs.cpp @@ -274,7 +274,7 @@ const char *CharsetRecog_sjis::getName() const const char *CharsetRecog_sjis::getLanguage() const { - return "jp"; + return "ja"; } CharsetRecog_euc::~CharsetRecog_euc() @@ -357,7 +357,7 @@ const char *CharsetRecog_euc_jp::getName() const const char *CharsetRecog_euc_jp::getLanguage() const { - return "jp"; + return "ja"; } int32_t CharsetRecog_euc_jp::match(InputText *det) @@ -377,7 +377,7 @@ const char *CharsetRecog_euc_kr::getName() const const char *CharsetRecog_euc_kr::getLanguage() const { - return "kr"; + return "ko"; } int32_t CharsetRecog_euc_kr::match(InputText *det) diff --git a/icu4c/source/i18n/csrsbcs.cpp b/icu4c/source/i18n/csrsbcs.cpp index e83e87beea1..e8c0d8cf18d 100644 --- a/icu4c/source/i18n/csrsbcs.cpp +++ b/icu4c/source/i18n/csrsbcs.cpp @@ -979,6 +979,11 @@ CharsetRecog_8859_8_I_he::~CharsetRecog_8859_8_I_he () // nothing to do } +const char *CharsetRecog_8859_8_I_he::getName() const +{ + return haveC1Bytes? "windows-1255" : "ISO-8859-8-I"; +} + const char *CharsetRecog_8859_8_I_he::getLanguage() const { return "he"; @@ -996,7 +1001,7 @@ CharsetRecog_8859_8_he::~CharsetRecog_8859_8_he() const char *CharsetRecog_8859_8_he::getLanguage() const { - return "he_VISUAL"; + return "he"; } int32_t CharsetRecog_8859_8_he::match(InputText *textIn) diff --git a/icu4c/source/i18n/csrsbcs.h b/icu4c/source/i18n/csrsbcs.h index c6e894bb060..1b4856ae663 100644 --- a/icu4c/source/i18n/csrsbcs.h +++ b/icu4c/source/i18n/csrsbcs.h @@ -108,7 +108,7 @@ class CharsetRecog_8859_8 : public CharsetRecog_sbcs public: virtual ~CharsetRecog_8859_8(); - const char *getName() const; + virtual const char *getName() const; }; class CharsetRecog_8859_9 : public CharsetRecog_sbcs @@ -294,6 +294,8 @@ class CharsetRecog_8859_8_I_he : public CharsetRecog_8859_8 public: virtual ~CharsetRecog_8859_8_I_he(); + const char *getName() const; + const char *getLanguage() const; int32_t match(InputText *textIn); diff --git a/icu4c/source/test/testdata/csdetest.xml b/icu4c/source/test/testdata/csdetest.xml index 15285b261e7..edef3c4730d 100644 --- a/icu4c/source/test/testdata/csdetest.xml +++ b/icu4c/source/test/testdata/csdetest.xml @@ -118,7 +118,7 @@ - + אירופה, תוכנה והאינטרנט: