diff options
| author | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 00:15:14 +0000 |
|---|---|---|
| committer | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 00:15:14 +0000 |
| commit | 643681cdfe66593c1d966accff36636caee2909f (patch) | |
| tree | 4eb8b1ea59096ab8ab8ef1c038af910d566dd23b /chrome/browser/character_encoding.cc | |
| parent | 66a257de543be47887bc1f6b6944c79df86adbc1 (diff) | |
| download | chromium_src-643681cdfe66593c1d966accff36636caee2909f.zip chromium_src-643681cdfe66593c1d966accff36636caee2909f.tar.gz chromium_src-643681cdfe66593c1d966accff36636caee2909f.tar.bz2 | |
Get rid of ISO-8859-9 in the character encoding menu because it's now treated as an alias to its superset, windows-1254.
BUG=4746
TEST=visit http://www.sabah.com.tr (ISO-8859-9 page) and make sure that 'Turkish' is checked in the encoding menu
Review URL: http://codereview.chromium.org/11811
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/character_encoding.cc')
| -rw-r--r-- | chrome/browser/character_encoding.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index c40895b..6fb8d97 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -53,7 +53,6 @@ static CanonicalEncodingData canonical_encoding_names[] = { { IDC_ENCODING_KOI8U, L"KOI8-U", IDS_ENCODING_CYRILLIC }, { IDC_ENCODING_ISO88597, L"ISO-8859-7", IDS_ENCODING_GREEK }, { IDC_ENCODING_WINDOWS1253, L"windows-1253", IDS_ENCODING_GREEK }, - { IDC_ENCODING_ISO88599, L"ISO-8859-9", IDS_ENCODING_TURKISH }, { IDC_ENCODING_WINDOWS1254, L"windows-1254", IDS_ENCODING_TURKISH }, { IDC_ENCODING_ISO88596, L"ISO-8859-6", IDS_ENCODING_ARABIC }, { IDC_ENCODING_WINDOWS1256, L"windows-1256", IDS_ENCODING_ARABIC }, @@ -178,7 +177,6 @@ const int default_encoding_menus[] = { 0, IDC_ENCODING_ISO88597, IDC_ENCODING_WINDOWS1253, - IDC_ENCODING_ISO88599, IDC_ENCODING_WINDOWS1254, IDC_ENCODING_ISO88596, IDC_ENCODING_WINDOWS1256, @@ -220,7 +218,8 @@ std::wstring GetEncodingDisplayName(std::wstring encoding_name, int category_string_id) { std::wstring category_name = l10n_util::GetString(category_string_id); if (category_string_id != IDS_ENCODING_KOREAN && - category_string_id != IDS_ENCODING_THAI) { + category_string_id != IDS_ENCODING_THAI && + category_string_id != IDS_ENCODING_TURKISH) { return l10n_util::GetStringF(IDS_ENCODING_DISPLAY_TEMPLATE, category_name, encoding_name); |