diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 06:25:20 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 06:25:20 +0000 |
| commit | 0241e5b828e1d83f33f6ff2f7a78317401013410 (patch) | |
| tree | 0dacd699e21e6dcb538ac858d19c30f88d7d42d3 | |
| parent | 093e38a026dbfdc1dadb864e7ab4b82c02410ef6 (diff) | |
| download | chromium_src-0241e5b828e1d83f33f6ff2f7a78317401013410.zip chromium_src-0241e5b828e1d83f33f6ff2f7a78317401013410.tar.gz chromium_src-0241e5b828e1d83f33f6ff2f7a78317401013410.tar.bz2 | |
Change language name for Cangjie and Quick input methods from zh to zh-TW
BUG=chromium-os:2540
TEST=ran the unittest
Review URL: http://codereview.chromium.org/2229002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48257 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/cros/language_library.cc | 18 | ||||
| -rw-r--r-- | chrome/browser/chromeos/cros/language_library_test.cc | 4 |
2 files changed, 14 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/cros/language_library.cc b/chrome/browser/chromeos/cros/language_library.cc index 37769e7..de2485d 100644 --- a/chrome/browser/chromeos/cros/language_library.cc +++ b/chrome/browser/chromeos/cros/language_library.cc @@ -110,15 +110,17 @@ bool LanguageLibrary::IsKeyboardLayout(const std::string& input_method_id) { std::string LanguageLibrary::GetLanguageCodeFromDescriptor( const InputMethodDescriptor& descriptor) { - // Special-case Chewing/Bopomofo/Pinyin. Handle these as zh-TW/zh-TW/zh-CN, - // rather than zh. + // Handle some Chinese input methods as zh-CN/zh-TW, rather than zh. // TODO: we should fix this issue in engines rather than here. - if (descriptor.id == "chewing" && descriptor.language_code == "zh") { - return "zh-TW"; - } else if (descriptor.id == "bopomofo" && descriptor.language_code == "zh") { - return "zh-TW"; - } else if (descriptor.id == "pinyin" && descriptor.language_code == "zh") { - return "zh-CN"; + if (descriptor.language_code == "zh") { + if (descriptor.id == "pinyin") { + return "zh-CN"; + } else if (descriptor.id == "bopomofo" || + descriptor.id == "chewing" || + descriptor.id == "m17n:zh:cangjie" || + descriptor.id == "m17n:zh:quick") { + return "zh-TW"; + } } std::string language_code = diff --git a/chrome/browser/chromeos/cros/language_library_test.cc b/chrome/browser/chromeos/cros/language_library_test.cc index 64f2b58..db32181 100644 --- a/chrome/browser/chromeos/cros/language_library_test.cc +++ b/chrome/browser/chromeos/cros/language_library_test.cc @@ -40,6 +40,10 @@ TEST(LanguageLibraryTest, GetLanguageCodeFromDescriptor) { InputMethodDescriptor("chewing", "Chewing", "us", "zh"))); EXPECT_EQ("zh-TW", LanguageLibrary::GetLanguageCodeFromDescriptor( InputMethodDescriptor("bopomofo", "Bopomofo(Zhuyin)", "us", "zh"))); + EXPECT_EQ("zh-TW", LanguageLibrary::GetLanguageCodeFromDescriptor( + InputMethodDescriptor("m17n:zh:cangjie", "Cangjie", "us", "zh"))); + EXPECT_EQ("zh-TW", LanguageLibrary::GetLanguageCodeFromDescriptor( + InputMethodDescriptor("m17n:zh:quick", "Quick", "us", "zh"))); EXPECT_EQ("zh-CN", LanguageLibrary::GetLanguageCodeFromDescriptor( InputMethodDescriptor("pinyin", "Pinyin", "us", "zh"))); EXPECT_EQ("en-US", LanguageLibrary::GetLanguageCodeFromDescriptor( |