diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-01 23:31:10 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-01 23:31:10 +0000 |
| commit | 5df6a23863b94bb70107f8a110131113e05b0b21 (patch) | |
| tree | 523ec89b52fe9e30d1490993f138c121ef14be4f /chrome/browser | |
| parent | 7256c50408de6476ecedf55d1c6fd6165cf08f95 (diff) | |
| download | chromium_src-5df6a23863b94bb70107f8a110131113e05b0b21.zip chromium_src-5df6a23863b94bb70107f8a110131113e05b0b21.tar.gz chromium_src-5df6a23863b94bb70107f8a110131113e05b0b21.tar.bz2 | |
Moving strings for the Korean input method from C++ file to .grd file.
* Use translated English strings rather than transliterated Korean strings.
* Drop "3-set 2-set" keyboard support since it's not widely used.
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/1718018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/language_preferences.h | 19 | ||||
| -rw-r--r-- | chrome/browser/chromeos/options/language_hangul_config_view.cc | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h index 359e07c..6350583 100644 --- a/chrome/browser/chromeos/language_preferences.h +++ b/chrome/browser/chromeos/language_preferences.h @@ -30,17 +30,18 @@ const char kHangulSectionName[] = "engine/Hangul"; const char kHangulKeyboardConfigName[] = "HangulKeyboard"; const struct HangulKeyboardNameIDPair { - const wchar_t* keyboard_name; + int message_id; const wchar_t* keyboard_id; } kHangulKeyboardNameIDPairs[] = { - // We have to sync the IDs with those in ibus-hangul/files/setup/main.py. - { L"Dubeolsik", L"2" }, - { L"Sebeolsik Final", L"3f" }, - { L"Sebeolsik 390", L"39" }, - { L"Sebeolsik No-shift", L"3s" }, - { L"Sebeolsik 2 set", L"32" }, - // TODO(yusukes): Use generated_resources.grd IDs for |keyboard_name|. Ask - // jshin first. + // We have to sync the |keyboard_id|s with those in + // ibus-hangul/files/setup/main.py. + { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_2_SET, L"2" }, + { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_3_SET_FINAL, + L"3f" }, + { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_3_SET_390, L"39" }, + { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_3_SET_NO_SHIFT, + L"3s" }, + // We don't support "Sebeolsik 2 set" keyboard. }; // For Simplified Chinese input method (ibus-pinyin) diff --git a/chrome/browser/chromeos/options/language_hangul_config_view.cc b/chrome/browser/chromeos/options/language_hangul_config_view.cc index ca31d92..52e3aa6 100644 --- a/chrome/browser/chromeos/options/language_hangul_config_view.cc +++ b/chrome/browser/chromeos/options/language_hangul_config_view.cc @@ -30,7 +30,7 @@ class HangulKeyboardComboboxModel : public ComboboxModel { HangulKeyboardComboboxModel() { for (size_t i = 0; i < arraysize(kHangulKeyboardNameIDPairs); ++i) { layouts_.push_back(std::make_pair( - kHangulKeyboardNameIDPairs[i].keyboard_name, + l10n_util::GetString(kHangulKeyboardNameIDPairs[i].message_id), kHangulKeyboardNameIDPairs[i].keyboard_id)); } } |