summaryrefslogtreecommitdiffstats
path: root/chrome/browser/translate
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 08:23:53 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 08:23:53 +0000
commit13c0fb1a4d5d83149dbccd2001f7828dbdb5473b (patch)
tree6ccf0dab37a7010a36fe4a33c09fbc35df7ce982 /chrome/browser/translate
parent96721067675b115fec50d299302fb2ec08de394d (diff)
downloadchromium_src-13c0fb1a4d5d83149dbccd2001f7828dbdb5473b.zip
chromium_src-13c0fb1a4d5d83149dbccd2001f7828dbdb5473b.tar.gz
chromium_src-13c0fb1a4d5d83149dbccd2001f7828dbdb5473b.tar.bz2
Translating from the English locale would translate to Afrikaans.
This is because the English locale 'en-US' would not match the English language code 'en' and we would default to the 1st language, Afrikaan. BUG=None TEST=Test that translate when Chrome is configured in English (US and UK), Spanish, Portuguese (Brazil and Portugal) does translate to the language Chrome is configured to be in. TBR=kuan Review URL: http://codereview.chromium.org/563005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
-rw-r--r--chrome/browser/translate/translate_manager.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index b566033..85d1260 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -80,13 +80,13 @@ void TranslateManager::InitiateTranslation(TabContents* tab,
}
std::string chrome_lang = g_browser_process->GetApplicationLocale();
+ chrome_lang = TranslationService::GetLanguageCode(chrome_lang);
// We don't want to translate:
// - any Chrome specific page (New Tab Page, Download, History... pages).
// - similar languages (ex: en-US to en).
// - any user black-listed URLs or user selected language combination.
if (entry->url().SchemeIs("chrome") || page_lang == chrome_lang ||
- !TranslationService::ShouldTranslatePage(page_lang, chrome_lang) ||
!TranslatePrefs::CanTranslate(prefs, page_lang, entry->url())) {
return;
}