summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-21 09:22:35 +0000
committeryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-21 09:22:35 +0000
commit15e62a4d5c7fc6b8cab5d9004b367e94ae911a7c (patch)
treefbc8bb552f08fa51a5b46a4da98b987da4e27732 /chrome
parent265dd76fd5f34d28cb567554b540f5d8cce1b8f6 (diff)
downloadchromium_src-15e62a4d5c7fc6b8cab5d9004b367e94ae911a7c.zip
chromium_src-15e62a4d5c7fc6b8cab5d9004b367e94ae911a7c.tar.gz
chromium_src-15e62a4d5c7fc6b8cab5d9004b367e94ae911a7c.tar.bz2
Update language_menu_l10n_util.cc data.
- Added DIRECT_INPUT for ibus-mozc. - Removed ROMAN and KANA since they're for ibus-anthy. BUG=chromium-os:3452 TEST=Checked ../chrome_log manually. Review URL: http://codereview.chromium.org/2110018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd12
-rw-r--r--chrome/browser/chromeos/status/language_menu_l10n_util.cc9
-rw-r--r--chrome/browser/chromeos/status/language_menu_l10n_util_unittest.cc2
3 files changed, 7 insertions, 16 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 67c8858..4dfd6d8 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7615,9 +7615,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_KATAKANA" desc="In the language menu button, this shows a character set in use is set to KATAKANA.">
Katakana
</message>
- <message name="IDS_STATUSBAR_IME_JAPANESE_IME_INPUT_MODE_KANA" desc="In the language menu button, this shows the input mode.">
- Kana
- </message>
</if>
<if expr="pp_ifdef('chromeos') and lang != 'ja'">
<message translateable="false" name="IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_HIRAGANA" desc="">
@@ -7626,11 +7623,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message translateable="false" name="IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_KATAKANA" desc="">
Katakana
</message>
- <message translateable="false" name="IDS_STATUSBAR_IME_JAPANESE_IME_INPUT_MODE_KANA" desc="">
- Kana
- </message>
</if>
<if expr="pp_ifdef('chromeos')">
+ <message name="IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_DIRECT_INPUT" desc="In the language menu button, this shows a character set in use is set to 'direct input' mode.">
+ Direct input
+ </message>
<!-- "Half width" part is translateable. -->
<message name="IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_HALF_WIDTH_KATAKANA" desc="In the language menu button, this shows a character set in use is set to half width Katakana.">
Half width Katakana
@@ -7641,9 +7638,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_WIDE_LATIN" desc="In the language menu button, this shows a character set in use is set to wide Latin.">
Wide Latin
</message>
- <message name="IDS_STATUSBAR_IME_JAPANESE_IME_INPUT_MODE_ROMAN" desc="In the language menu button, this shows the input mode.">
- Roman
- </message>
<message name="IDS_STATUSBAR_IME_KOREAN_HANJA_MODE" desc="In the language menu button, this shows the input mode.">
Enable/Disable Hanja mode
</message>
diff --git a/chrome/browser/chromeos/status/language_menu_l10n_util.cc b/chrome/browser/chromeos/status/language_menu_l10n_util.cc
index 8f50f370..e0667a4 100644
--- a/chrome/browser/chromeos/status/language_menu_l10n_util.cc
+++ b/chrome/browser/chromeos/status/language_menu_l10n_util.cc
@@ -15,17 +15,14 @@ const struct EnglishToResouceId {
const char* english_string_from_ibus;
int resource_id;
} kEnglishToResourceIdArray[] = {
- // For both ibus-anthy and ibus-google-japanese-input.
- // - ibus-anthy: third_party/ibus-anthy/files/po/
- // - ibus-google-japanese-input: TBD
+ // For ibus-mozc: third_party/ibus-mozc/files/src/unix/ibus/.
+ { "Direct input", IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_DIRECT_INPUT },
{ "Hiragana", IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_HIRAGANA },
{ "Katakana", IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_KATAKANA },
{ "Half width katakana", // small k is not a typo.
- IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_HALF_WIDTH_KATAKANA },
+ IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_HALF_WIDTH_KATAKANA },
{ "Latin", IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_LATIN },
{ "Wide Latin", IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_WIDE_LATIN },
- { "Roman", IDS_STATUSBAR_IME_JAPANESE_IME_INPUT_MODE_ROMAN },
- { "Kana", IDS_STATUSBAR_IME_JAPANESE_IME_INPUT_MODE_KANA },
// For ibus-hangul: third_party/ibus-hangul/files/po/.
{ "Enable/Disable Hanja mode", IDS_STATUSBAR_IME_KOREAN_HANJA_MODE },
diff --git a/chrome/browser/chromeos/status/language_menu_l10n_util_unittest.cc b/chrome/browser/chromeos/status/language_menu_l10n_util_unittest.cc
index 114340d..8865cfc 100644
--- a/chrome/browser/chromeos/status/language_menu_l10n_util_unittest.cc
+++ b/chrome/browser/chromeos/status/language_menu_l10n_util_unittest.cc
@@ -11,7 +11,7 @@ namespace chromeos {
TEST(LanguageMenuL10nUtilTest, FindLocalizedStringTest) {
EXPECT_TRUE(LanguageMenuL10nUtil::StringIsSupported("Hiragana"));
EXPECT_TRUE(LanguageMenuL10nUtil::StringIsSupported("Latin"));
- EXPECT_TRUE(LanguageMenuL10nUtil::StringIsSupported("Kana"));
+ EXPECT_TRUE(LanguageMenuL10nUtil::StringIsSupported("Direct input"));
EXPECT_FALSE(LanguageMenuL10nUtil::StringIsSupported(
"####THIS_STRING_IS_NOT_SUPPORTED####"));
}