Use localized string for Input method names in the text input config dialog.

BUG=chromium-os:3428
TEST=manually

Review URL: http://codereview.chromium.org/2168002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48129 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 117 insertions, 1 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index a72eecd..1f573a6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7615,6 +7615,82 @@ Keep your key file in a safe place. You will need it to create new versions of y
                desc="The label for a language that is currently used for UI">
         <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph> is displayed in this language
       </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_STANDARD_INPUT_METHOD"
+               desc="The label for a input method">
+        Standard input method
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_PERSIAN_ISIRI_2901_INPUT_METHOD"
+               desc="The label for the Persian (Farsi) input method">
+        Persian input method (ISIRI 2901 layout)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_THAI_KESMANEE_INPUT_METHOD"
+               desc="The label for the Thai input method">
+        Thai input method (Kesmanee keyboard)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_THAI_TIS820_INPUT_METHOD"
+               desc="The label for the Thai input method">
+        Thai input method (TIS-820.2538 keyboard)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_THAI_PATTACHOTE_INPUT_METHOD"
+               desc="The label for the Thai input method">
+        Thai input method (Pattachote keyboard)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_TCVN_INPUT_METHOD"
+               desc="The label for the Vietnamese input method">
+        Vietnamese input method (TCVN6064)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_TELEX_INPUT_METHOD"
+               desc="The label for the Vietnamese input method">
+        Vietnamese input method (TELEX)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_VIQR_INPUT_METHOD"
+               desc="The label for the Vietnamese input method">
+        Vietnamese input method (VIQR)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_VNI_INPUT_METHOD"
+               desc="The label for the Vietnamese input method">
+        Vietnamese input method (VNI)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_LATIN_POST_INPUT_METHOD"
+               desc="The label for the 'latn-post' input method">
+        Latin input method using postfix modifiers
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_LATIN_PRE_INPUT_METHOD"
+               desc="The label for the 'latn-pre' input method">
+        Latin input method using prefix modifiers
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_BOPOMOFO_INPUT_METHOD"
+               desc="The label for the Bopomofo (Zhuyin) traditional Chinese input method">
+	Bopomofo input method
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_INPUT_METHOD"
+               desc="The label for the Chewing traditional Chinese input method">
+	Chewing input method
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_INPUT_METHOD"
+               desc="The label for the Pinyin simplified Chinese input method">
+	Pinyin input method
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_MOZC_US_INPUT_METHOD"
+               desc="The label for the Japanese input method for US keyboard">
+	Japanese input method (for US keyboard)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_MOZC_JP_INPUT_METHOD"
+               desc="The label for the Japanese input method for Japanese keyboard">
+	Japanese input method (for Japanese keyboard)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_US_INPUT_METHOD"
+               desc="The label for the Google Japanese Input input method for US keyboard">
+	Google Japanese Input (for US keyboard)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_JP_INPUT_METHOD"
+               desc="The label for the Google Japanese Input input method for Japanese keyboard">
+	Google Japanese Input (for Japanese keyboard)
+      </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_KOREAN_INPUT_METHOD"
+               desc="The label for the Korean input method">
+	Korean input method
+      </message>
       <message name="IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET" desc="The ethernet network device.">
         Ethernet
       </message>
diff --git a/chrome/browser/chromeos/options/language_config_view.cc b/chrome/browser/chromeos/options/language_config_view.cc
index fe3f2c7..0b38bdf 100644
--- a/chrome/browser/chromeos/options/language_config_view.cc
+++ b/chrome/browser/chromeos/options/language_config_view.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/chromeos/options/language_pinyin_config_view.h"
 #include "chrome/browser/chromeos/options/options_window_view.h"
 #include "chrome/browser/chromeos/preferences.h"
+#include "chrome/browser/chromeos/status/language_menu_l10n_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/restart_message_box.h"
@@ -524,7 +525,8 @@ void LanguageConfigView::InitInputMethodIdMaps() {
     id_to_language_code_map_.insert(
         std::make_pair(input_method.id, language_code));
     id_to_display_name_map_.insert(
-        std::make_pair(input_method.id, input_method.display_name));
+        std::make_pair(input_method.id, LanguageMenuL10nUtil::GetStringUTF8(
+            input_method.display_name)));
   }
 }
 
diff --git a/chrome/browser/chromeos/status/language_menu_l10n_util.cc b/chrome/browser/chromeos/status/language_menu_l10n_util.cc
index e0667a4..3a420f9 100644
--- a/chrome/browser/chromeos/status/language_menu_l10n_util.cc
+++ b/chrome/browser/chromeos/status/language_menu_l10n_util.cc
@@ -37,6 +37,44 @@ const struct EnglishToResouceId {
     IDS_STATUSBAR_IME_CHINESE_PINYIN_TOGGLE_S_T_CHINESE },
 
   // TODO(yusukes): Support ibus-chewing and ibus-table-* if needed.
+
+  // For the "Languages and Input" dialog.
+  { "kbd (m17n)", IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_STANDARD_INPUT_METHOD },
+  { "itrans (m17n)",  // also uses the "STANDARD_INPUT_METHOD" id.
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_STANDARD_INPUT_METHOD },
+  { "isiri (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_PERSIAN_ISIRI_2901_INPUT_METHOD },
+  { "kesmanee (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_THAI_KESMANEE_INPUT_METHOD },
+  { "tis820 (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_THAI_TIS820_INPUT_METHOD },
+  { "pattachote (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_THAI_PATTACHOTE_INPUT_METHOD },
+  { "tcvn (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_TCVN_INPUT_METHOD },
+  { "telex (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_TELEX_INPUT_METHOD },
+  { "viqr (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_VIQR_INPUT_METHOD },
+  { "vni (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_VNI_INPUT_METHOD },
+  { "latn-post (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_LATIN_POST_INPUT_METHOD },
+  { "latn-pre (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_LATIN_PRE_INPUT_METHOD },
+  { "Bopomofo", IDS_OPTIONS_SETTINGS_LANGUAGES_BOPOMOFO_INPUT_METHOD },
+  { "Chewing", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_INPUT_METHOD },
+  { "Pinyin", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_INPUT_METHOD },
+  { "Mozc (US keyboard layout)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_MOZC_US_INPUT_METHOD },
+  { "Mozc (Japanese keyboard layout)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_MOZC_JP_INPUT_METHOD },
+  { "Google Japanese Input (US keyboard layout)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_US_INPUT_METHOD },
+  { "Google Japanese Input (Japanese keyboard layout)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_JP_INPUT_METHOD },
+  { "Korean", IDS_OPTIONS_SETTINGS_LANGUAGES_KOREAN_INPUT_METHOD },
+  // TODO(yusukes): Support input methods in the ibus-xkb-layouts engine.
 };
 const size_t kNumEntries = arraysize(kEnglishToResourceIdArray);