Chromium Code Reviews| Index: chrome/common/translate/language_detection_util.cc |
| diff --git a/chrome/renderer/translate/translate_helper.cc b/chrome/common/translate/language_detection_util.cc |
| similarity index 38% |
| copy from chrome/renderer/translate/translate_helper.cc |
| copy to chrome/common/translate/language_detection_util.cc |
| index 07417573712850bf9ac6a89373a64de32f918078..d8891f705d4267b073f13fe63231e017e282702e 100644 |
| --- a/chrome/renderer/translate/translate_helper.cc |
| +++ b/chrome/common/translate/language_detection_util.cc |
| @@ -1,61 +1,23 @@ |
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +// Copyright (c) 2013 The Chromium Authors. All rights reserved. |
|
hajimehoshi
2013/07/11 07:34:30
(c) is not needed.
|
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "chrome/renderer/translate/translate_helper.h" |
| +#include "chrome/common/translate/language_detection_util.h" |
| -#include "base/bind.h" |
| -#include "base/compiler_specific.h" |
| #include "base/logging.h" |
| -#include "base/message_loop.h" |
| -#include "base/strings/string16.h" |
| #include "base/strings/string_split.h" |
| #include "base/strings/string_util.h" |
| -#include "base/strings/utf_string_conversions.h" |
| +#include "base/time/time.h" |
| #include "chrome/common/chrome_constants.h" |
| -#include "chrome/common/render_messages.h" |
| +#include "chrome/common/translate/translate_helper_metrics.h" |
| #include "chrome/common/translate/translate_util.h" |
| -#include "chrome/renderer/translate/translate_helper_metrics.h" |
| -#include "content/public/renderer/render_view.h" |
| -#include "third_party/WebKit/public/web/WebDocument.h" |
| -#include "third_party/WebKit/public/web/WebElement.h" |
| -#include "third_party/WebKit/public/web/WebFrame.h" |
| -#include "third_party/WebKit/public/web/WebNode.h" |
| -#include "third_party/WebKit/public/web/WebNodeList.h" |
| -#include "third_party/WebKit/public/web/WebScriptSource.h" |
| -#include "third_party/WebKit/public/web/WebView.h" |
| -#include "v8/include/v8.h" |
| #if defined(ENABLE_LANGUAGE_DETECTION) |
| #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h" |
| #endif |
| -using WebKit::WebDocument; |
| -using WebKit::WebElement; |
| -using WebKit::WebFrame; |
| -using WebKit::WebNode; |
| -using WebKit::WebNodeList; |
| -using WebKit::WebScriptSource; |
| -using WebKit::WebString; |
| -using WebKit::WebView; |
| - |
| namespace { |
| -// The delay in milliseconds that we'll wait before checking to see if the |
| -// translate library injected in the page is ready. |
| -const int kTranslateInitCheckDelayMs = 150; |
| - |
| -// The maximum number of times we'll check to see if the translate library |
| -// injected in the page is ready. |
| -const int kMaxTranslateInitCheckAttempts = 5; |
| - |
| -// The delay we wait in milliseconds before checking whether the translation has |
| -// finished. |
| -const int kTranslateStatusCheckDelayMs = 400; |
| - |
| -// Language name passed to the Translate element for it to detect the language. |
| -const char kAutoDetectionLanguage[] = "auto"; |
| - |
| // Similar language code list. Some languages are very similar and difficult |
| // for CLD to distinguish. |
| struct SimilarLanguageCode { |
| @@ -88,85 +50,25 @@ const char* kWellKnownCodesOnWrongConfiguration[] = { |
| "es", "pt", "ja", "ru", "de", "zh-CN", "zh-TW", "ar", "id", "fr", "it", "th" |
| }; |
| -} // namespace |
| - |
| -//////////////////////////////////////////////////////////////////////////////// |
| -// TranslateHelper, public: |
| -// |
| -TranslateHelper::TranslateHelper(content::RenderView* render_view) |
| - : content::RenderViewObserver(render_view), |
| - page_id_(-1), |
| - translation_pending_(false), |
| - weak_method_factory_(this) { |
| -} |
| - |
| -TranslateHelper::~TranslateHelper() { |
| - CancelPendingTranslation(); |
| -} |
| - |
| -void TranslateHelper::PageCaptured(int page_id, const string16& contents) { |
| - // Get the document language as set by WebKit from the http-equiv |
| - // meta tag for "content-language". This may or may not also |
| - // have a value derived from the actual Content-Language HTTP |
| - // header. The two actually have different meanings (despite the |
| - // original intent of http-equiv to be an equivalent) with the former |
| - // being the language of the document and the latter being the |
| - // language of the intended audience (a distinction really only |
| - // relevant for things like langauge textbooks). This distinction |
| - // shouldn't affect translation. |
| - WebFrame* main_frame = GetMainFrame(); |
| - if (!main_frame || render_view()->GetPageId() != page_id) |
| - return; |
| - page_id_ = page_id; |
| - WebDocument document = main_frame->document(); |
| - std::string content_language = document.contentLanguage().utf8(); |
| - WebElement html_element = document.documentElement(); |
| - std::string html_lang; |
| - // |html_element| can be null element, e.g. in |
| - // BrowserTest.WindowOpenClose. |
| - if (!html_element.isNull()) |
| - html_lang = html_element.getAttribute("lang").utf8(); |
| - std::string cld_language; |
| - bool is_cld_reliable; |
| - std::string language = DeterminePageLanguage( |
| - content_language, html_lang, contents, &cld_language, &is_cld_reliable); |
| +// Applies a series of language code modification in proper order. |
| +void ApplyLanguageCodeCorrection(std::string* code) { |
| + // Correct well-known format errors. |
| + LanguageDetectionUtil::CorrectLanguageCodeTypo(code); |
| - if (language.empty()) |
| + if (!LanguageDetectionUtil::IsValidLanguageCode(*code)) { |
| + *code = std::string(); |
| return; |
| + } |
| - language_determined_time_ = base::TimeTicks::Now(); |
| - |
| - GURL url(document.url()); |
| - LanguageDetectionDetails details; |
| - details.time = base::Time::Now(); |
| - details.url = url; |
| - details.content_language = content_language; |
| - details.cld_language = cld_language; |
| - details.is_cld_reliable = is_cld_reliable; |
| - details.html_root_language = html_lang; |
| - details.adopted_language = language; |
| - |
| - // TODO(hajimehoshi): If this affects performance, it should be set only if |
| - // translate-internals tab exists. |
| - details.contents = contents; |
| - |
| - Send(new ChromeViewHostMsg_TranslateLanguageDetermined( |
| - routing_id(), |
| - details, |
| - IsTranslationAllowed(&document) && !language.empty())); |
| -} |
| - |
| -void TranslateHelper::CancelPendingTranslation() { |
| - weak_method_factory_.InvalidateWeakPtrs(); |
| - translation_pending_ = false; |
| - source_lang_.clear(); |
| - target_lang_.clear(); |
| + TranslateUtil::ToTranslateLanguageSynonym(code); |
| } |
| #if defined(ENABLE_LANGUAGE_DETECTION) |
| -// static |
| -std::string TranslateHelper::DetermineTextLanguage(const string16& text, |
| - bool* is_cld_reliable) { |
| +// Returns the ISO 639_1 language code of the specified |text|, or 'unknown' |
|
hajimehoshi
2013/07/11 07:34:30
DetermineTextLanguage could return a language code
|
| +// if it failed. |
| +// |is_cld_reliable| will be set as true if CLD says the detection is reliable. |
| +std::string DetermineTextLanguage(const base::string16& text, |
| + bool* is_cld_reliable) { |
| std::string language = chrome::kUnknownLanguageCode; |
| int num_languages = 0; |
| int text_bytes = 0; |
| @@ -199,231 +101,9 @@ std::string TranslateHelper::DetermineTextLanguage(const string16& text, |
| } |
| #endif // defined(ENABLE_LANGUAGE_DETECTION) |
| -//////////////////////////////////////////////////////////////////////////////// |
| -// TranslateHelper, protected: |
| -// |
| -bool TranslateHelper::IsTranslateLibAvailable() { |
| - return ExecuteScriptAndGetBoolResult( |
| - "typeof cr != 'undefined' && typeof cr.googleTranslate != 'undefined' && " |
| - "typeof cr.googleTranslate.translate == 'function'", false); |
| -} |
| - |
| -bool TranslateHelper::IsTranslateLibReady() { |
| - return ExecuteScriptAndGetBoolResult("cr.googleTranslate.libReady", false); |
| -} |
| - |
| -bool TranslateHelper::HasTranslationFinished() { |
| - return ExecuteScriptAndGetBoolResult("cr.googleTranslate.finished", true); |
| -} |
| - |
| -bool TranslateHelper::HasTranslationFailed() { |
| - return ExecuteScriptAndGetBoolResult("cr.googleTranslate.error", true); |
| -} |
| - |
| -bool TranslateHelper::StartTranslation() { |
| - std::string script = "cr.googleTranslate.translate('" + |
| - source_lang_ + |
| - "','" + |
| - target_lang_ + |
| - "')"; |
| - return ExecuteScriptAndGetBoolResult(script, false); |
| -} |
| - |
| -std::string TranslateHelper::GetOriginalPageLanguage() { |
| - return ExecuteScriptAndGetStringResult("cr.googleTranslate.sourceLang"); |
| -} |
| - |
| -base::TimeDelta TranslateHelper::AdjustDelay(int delayInMs) { |
| - // Just converts |delayInMs| without any modification in practical cases. |
| - // Tests will override this function to return modified value. |
| - return base::TimeDelta::FromMilliseconds(delayInMs); |
| -} |
| - |
| -void TranslateHelper::ExecuteScript(const std::string& script) { |
| - WebFrame* main_frame = GetMainFrame(); |
| - if (main_frame) |
| - main_frame->executeScript(WebScriptSource(ASCIIToUTF16(script))); |
| -} |
| - |
| -bool TranslateHelper::ExecuteScriptAndGetBoolResult(const std::string& script, |
| - bool fallback) { |
| - WebFrame* main_frame = GetMainFrame(); |
| - if (!main_frame) |
| - return fallback; |
| - |
| - v8::HandleScope handle_scope; |
| - v8::Handle<v8::Value> v = main_frame->executeScriptAndReturnValue( |
| - WebScriptSource(ASCIIToUTF16(script))); |
| - if (v.IsEmpty() || !v->IsBoolean()) { |
| - NOTREACHED(); |
| - return fallback; |
| - } |
| - |
| - return v->BooleanValue(); |
| -} |
| - |
| -std::string TranslateHelper::ExecuteScriptAndGetStringResult( |
| - const std::string& script) { |
| - WebFrame* main_frame = GetMainFrame(); |
| - if (!main_frame) |
| - return std::string(); |
| - |
| - v8::HandleScope handle_scope; |
| - v8::Handle<v8::Value> v = main_frame->executeScriptAndReturnValue( |
| - WebScriptSource(ASCIIToUTF16(script))); |
| - if (v.IsEmpty() || !v->IsString()) { |
| - NOTREACHED(); |
| - return std::string(); |
| - } |
| - |
| - v8::Local<v8::String> v8_str = v->ToString(); |
| - int length = v8_str->Utf8Length() + 1; |
| - scoped_ptr<char[]> str(new char[length]); |
| - v8_str->WriteUtf8(str.get(), length); |
| - return std::string(str.get()); |
| -} |
| - |
| -double TranslateHelper::ExecuteScriptAndGetDoubleResult( |
| - const std::string& script) { |
| - WebFrame* main_frame = GetMainFrame(); |
| - if (!main_frame) |
| - return 0.0; |
| - |
| - v8::HandleScope handle_scope; |
| - v8::Handle<v8::Value> v = main_frame->executeScriptAndReturnValue( |
| - WebScriptSource(ASCIIToUTF16(script))); |
| - if (v.IsEmpty() || !v->IsNumber()) { |
| - NOTREACHED(); |
| - return 0.0; |
| - } |
| - |
| - return v->NumberValue(); |
| -} |
| - |
| -//////////////////////////////////////////////////////////////////////////////// |
| -// TranslateHelper, private: |
| -// |
| -// static |
| -void TranslateHelper::CorrectLanguageCodeTypo(std::string* code) { |
| - DCHECK(code); |
| - |
| - size_t coma_index = code->find(','); |
| - if (coma_index != std::string::npos) { |
| - // There are more than 1 language specified, just keep the first one. |
| - *code = code->substr(0, coma_index); |
| - } |
| - TrimWhitespaceASCII(*code, TRIM_ALL, code); |
| - |
| - // An underscore instead of a dash is a frequent mistake. |
| - size_t underscore_index = code->find('_'); |
| - if (underscore_index != std::string::npos) |
| - (*code)[underscore_index] = '-'; |
| - |
| - // Change everything up to a dash to lower-case and everything after to upper. |
| - size_t dash_index = code->find('-'); |
| - if (dash_index != std::string::npos) { |
| - *code = StringToLowerASCII(code->substr(0, dash_index)) + |
| - StringToUpperASCII(code->substr(dash_index)); |
| - } else { |
| - *code = StringToLowerASCII(*code); |
| - } |
| -} |
| - |
| -// static |
| -bool TranslateHelper::IsValidLanguageCode(const std::string& code) { |
| - // Roughly check if the language code follows /[a-zA-Z]{2,3}(-[a-zA-Z]{2})?/. |
| - // TODO(hajimehoshi): How about es-419, which is used as an Accept language? |
| - std::vector<std::string> chunks; |
| - base::SplitString(code, '-', &chunks); |
| - |
| - if (chunks.size() < 1 || 2 < chunks.size()) |
| - return false; |
| - |
| - const std::string& main_code = chunks[0]; |
| - |
| - if (main_code.size() < 1 || 3 < main_code.size()) |
| - return false; |
| - |
| - for (std::string::const_iterator it = main_code.begin(); |
| - it != main_code.end(); ++it) { |
| - if (!IsAsciiAlpha(*it)) |
| - return false; |
| - } |
| - |
| - if (chunks.size() == 1) |
| - return true; |
| - |
| - const std::string& sub_code = chunks[1]; |
| - |
| - if (sub_code.size() != 2) |
| - return false; |
| - |
| - for (std::string::const_iterator it = sub_code.begin(); |
| - it != sub_code.end(); ++it) { |
| - if (!IsAsciiAlpha(*it)) |
| - return false; |
| - } |
| - |
| - return true; |
| -} |
| - |
| -// static |
| -void TranslateHelper::ApplyLanguageCodeCorrection(std::string* code) { |
| - // Correct well-known format errors. |
| - CorrectLanguageCodeTypo(code); |
| - |
| - if (!IsValidLanguageCode(*code)) { |
| - *code = std::string(); |
| - return; |
| - } |
| - |
| - TranslateUtil::ToTranslateLanguageSynonym(code); |
| -} |
| - |
| -// static |
| -bool TranslateHelper::IsSameOrSimilarLanguages( |
| - const std::string& page_language, const std::string& cld_language) { |
| - // Language code part of |page_language| is matched to one of |cld_language|. |
| - // Country code is ignored here. |
| - if (page_language.size() >= 2 && |
| - cld_language.find(page_language.c_str(), 0, 2) == 0) { |
| - // Languages are matched strictly. Reports false to metrics, but returns |
| - // true. |
| - TranslateHelperMetrics::ReportSimilarLanguageMatch(false); |
| - return true; |
| - } |
| - |
| - // Check if |page_language| and |cld_language| are in the similar language |
| - // list and belong to the same language group. |
| - int page_code = GetSimilarLanguageGroupCode(page_language); |
| - bool match = page_code != 0 && |
| - page_code == GetSimilarLanguageGroupCode(cld_language); |
| - |
| - TranslateHelperMetrics::ReportSimilarLanguageMatch(match); |
| - return match; |
| -} |
| - |
| -// static |
| -bool TranslateHelper::MaybeServerWrongConfiguration( |
| - const std::string& page_language, const std::string& cld_language) { |
| - // If |page_language| is not "en-*", respect it and just return false here. |
| - if (!StartsWithASCII(page_language, "en", false)) |
| - return false; |
| - |
| - // A server provides a language meta information representing "en-*". But it |
| - // might be just a default value due to missing user configuration. |
| - // Let's trust |cld_language| if the determined language is not difficult to |
| - // distinguish from English, and the language is one of well-known languages |
| - // which often provide "en-*" meta information mistakenly. |
| - for (size_t i = 0; i < arraysize(kWellKnownCodesOnWrongConfiguration); ++i) { |
| - if (cld_language == kWellKnownCodesOnWrongConfiguration[i]) |
| - return true; |
| - } |
| - return false; |
| -} |
| - |
| -// static |
| -bool TranslateHelper::CanCLDComplementSubCode( |
| +// Checks if CLD can complement a sub code when the page language doesn't know |
| +// the sub code. |
| +bool CanCLDComplementSubCode( |
| const std::string& page_language, const std::string& cld_language) { |
| // Translate server cannot treat general Chinese. If Content-Language and |
| // CLD agree that the language is Chinese and Content-Language doesn't know |
| @@ -432,12 +112,15 @@ bool TranslateHelper::CanCLDComplementSubCode( |
| return page_language == "zh" && StartsWithASCII(cld_language, "zh-", false); |
| } |
| -// static |
| -std::string TranslateHelper::DeterminePageLanguage(const std::string& code, |
| - const std::string& html_lang, |
| - const string16& contents, |
| - std::string* cld_language_p, |
| - bool* is_cld_reliable_p) { |
| +} // namespace |
| + |
| +namespace LanguageDetectionUtil { |
| + |
| +std::string DeterminePageLanguage(const std::string& code, |
| + const std::string& html_lang, |
| + const base::string16& contents, |
| + std::string* cld_language_p, |
| + bool* is_cld_reliable_p) { |
| #if defined(ENABLE_LANGUAGE_DETECTION) |
| base::TimeTicks begin_time = base::TimeTicks::Now(); |
| bool is_cld_reliable; |
| @@ -516,219 +199,106 @@ std::string TranslateHelper::DeterminePageLanguage(const std::string& code, |
| return language; |
| } |
| -// static |
| -bool TranslateHelper::IsTranslationAllowed(WebDocument* document) { |
| - WebElement head = document->head(); |
| - if (head.isNull() || !head.hasChildNodes()) |
| - return true; |
| - |
| - const WebString meta(ASCIIToUTF16("meta")); |
| - const WebString name(ASCIIToUTF16("name")); |
| - const WebString google(ASCIIToUTF16("google")); |
| - const WebString value(ASCIIToUTF16("value")); |
| - const WebString content(ASCIIToUTF16("content")); |
| +void CorrectLanguageCodeTypo(std::string* code) { |
| + DCHECK(code); |
| - WebNodeList children = head.childNodes(); |
| - for (size_t i = 0; i < children.length(); ++i) { |
| - WebNode node = children.item(i); |
| - if (!node.isElementNode()) |
| - continue; |
| - WebElement element = node.to<WebElement>(); |
| - // Check if a tag is <meta>. |
| - if (!element.hasTagName(meta)) |
| - continue; |
| - // Check if the tag contains name="google". |
| - WebString attribute = element.getAttribute(name); |
| - if (attribute.isNull() || attribute != google) |
| - continue; |
| - // Check if the tag contains value="notranslate", or content="notranslate". |
| - attribute = element.getAttribute(value); |
| - if (attribute.isNull()) |
| - attribute = element.getAttribute(content); |
| - if (attribute.isNull()) |
| - continue; |
| - if (LowerCaseEqualsASCII(attribute, "notranslate")) |
| - return false; |
| + size_t coma_index = code->find(','); |
| + if (coma_index != std::string::npos) { |
| + // There are more than 1 language specified, just keep the first one. |
| + *code = code->substr(0, coma_index); |
| } |
| - return true; |
| -} |
| - |
| -bool TranslateHelper::OnMessageReceived(const IPC::Message& message) { |
| - bool handled = true; |
| - IPC_BEGIN_MESSAGE_MAP(TranslateHelper, message) |
| - IPC_MESSAGE_HANDLER(ChromeViewMsg_TranslatePage, OnTranslatePage) |
| - IPC_MESSAGE_HANDLER(ChromeViewMsg_RevertTranslation, OnRevertTranslation) |
| - IPC_MESSAGE_UNHANDLED(handled = false) |
| - IPC_END_MESSAGE_MAP() |
| - return handled; |
| -} |
| + TrimWhitespaceASCII(*code, TRIM_ALL, code); |
| -void TranslateHelper::OnTranslatePage(int page_id, |
| - const std::string& translate_script, |
| - const std::string& source_lang, |
| - const std::string& target_lang) { |
| - WebFrame* main_frame = GetMainFrame(); |
| - if (!main_frame || |
| - page_id_ != page_id || |
| - render_view()->GetPageId() != page_id) |
| - return; // We navigated away, nothing to do. |
| - |
| - // A similar translation is already under way, nothing to do. |
| - if (translation_pending_ && target_lang_ == target_lang) |
| - return; |
| + // An underscore instead of a dash is a frequent mistake. |
| + size_t underscore_index = code->find('_'); |
| + if (underscore_index != std::string::npos) |
| + (*code)[underscore_index] = '-'; |
| - // Any pending translation is now irrelevant. |
| - CancelPendingTranslation(); |
| + // Change everything up to a dash to lower-case and everything after to upper. |
| + size_t dash_index = code->find('-'); |
| + if (dash_index != std::string::npos) { |
| + *code = StringToLowerASCII(code->substr(0, dash_index)) + |
| + StringToUpperASCII(code->substr(dash_index)); |
| + } else { |
| + *code = StringToLowerASCII(*code); |
| + } |
| +} |
| - // Set our states. |
| - translation_pending_ = true; |
| +bool IsValidLanguageCode(const std::string& code) { |
| + // Roughly check if the language code follows /[a-zA-Z]{2,3}(-[a-zA-Z]{2})?/. |
| + // TODO(hajimehoshi): How about es-419, which is used as an Accept language? |
| + std::vector<std::string> chunks; |
| + base::SplitString(code, '-', &chunks); |
| - // If the source language is undetermined, we'll let the translate element |
| - // detect it. |
| - source_lang_ = (source_lang != chrome::kUnknownLanguageCode) ? |
| - source_lang : kAutoDetectionLanguage; |
| - target_lang_ = target_lang; |
| + if (chunks.size() < 1 || 2 < chunks.size()) |
| + return false; |
| - TranslateHelperMetrics::ReportUserActionDuration(language_determined_time_, |
| - base::TimeTicks::Now()); |
| + const std::string& main_code = chunks[0]; |
| - GURL url(main_frame->document().url()); |
| - TranslateHelperMetrics::ReportPageScheme(url.scheme()); |
| + if (main_code.size() < 1 || 3 < main_code.size()) |
| + return false; |
| - if (!IsTranslateLibAvailable()) { |
| - // Evaluate the script to add the translation related method to the global |
| - // context of the page. |
| - ExecuteScript(translate_script); |
| - DCHECK(IsTranslateLibAvailable()); |
| + for (std::string::const_iterator it = main_code.begin(); |
| + it != main_code.end(); ++it) { |
| + if (!IsAsciiAlpha(*it)) |
| + return false; |
| } |
| - TranslatePageImpl(0); |
| -} |
| + if (chunks.size() == 1) |
| + return true; |
| -void TranslateHelper::OnRevertTranslation(int page_id) { |
| - if (page_id_ != page_id || render_view()->GetPageId() != page_id) |
| - return; // We navigated away, nothing to do. |
| + const std::string& sub_code = chunks[1]; |
| - if (!IsTranslateLibAvailable()) { |
| - NOTREACHED(); |
| - return; |
| - } |
| + if (sub_code.size() != 2) |
| + return false; |
| - CancelPendingTranslation(); |
| + for (std::string::const_iterator it = sub_code.begin(); |
| + it != sub_code.end(); ++it) { |
| + if (!IsAsciiAlpha(*it)) |
| + return false; |
| + } |
| - ExecuteScript("cr.googleTranslate.revert()"); |
| + return true; |
| } |
| -void TranslateHelper::CheckTranslateStatus() { |
| - // If this is not the same page, the translation has been canceled. If the |
| - // view is gone, the page is closing. |
| - if (page_id_ != render_view()->GetPageId() || !render_view()->GetWebView()) |
| - return; |
| - |
| - // First check if there was an error. |
| - if (HasTranslationFailed()) { |
| - NotifyBrowserTranslationFailed(TranslateErrors::TRANSLATION_ERROR); |
| - return; // There was an error. |
| +bool IsSameOrSimilarLanguages(const std::string& page_language, |
| + const std::string& cld_language) { |
| + // Language code part of |page_language| is matched to one of |cld_language|. |
| + // Country code is ignored here. |
| + if (page_language.size() >= 2 && |
| + cld_language.find(page_language.c_str(), 0, 2) == 0) { |
| + // Languages are matched strictly. Reports false to metrics, but returns |
| + // true. |
| + TranslateHelperMetrics::ReportSimilarLanguageMatch(false); |
| + return true; |
| } |
| - if (HasTranslationFinished()) { |
| - std::string actual_source_lang; |
| - // Translation was successfull, if it was auto, retrieve the source |
| - // language the Translate Element detected. |
| - if (source_lang_ == kAutoDetectionLanguage) { |
| - actual_source_lang = GetOriginalPageLanguage(); |
| - if (actual_source_lang.empty()) { |
| - NotifyBrowserTranslationFailed(TranslateErrors::UNKNOWN_LANGUAGE); |
| - return; |
| - } else if (actual_source_lang == target_lang_) { |
| - NotifyBrowserTranslationFailed(TranslateErrors::IDENTICAL_LANGUAGES); |
| - return; |
| - } |
| - } else { |
| - actual_source_lang = source_lang_; |
| - } |
| - |
| - if (!translation_pending_) { |
| - NOTREACHED(); |
| - return; |
| - } |
| - |
| - translation_pending_ = false; |
| - |
| - // Check JavaScript performance counters for UMA reports. |
| - TranslateHelperMetrics::ReportTimeToTranslate( |
| - ExecuteScriptAndGetDoubleResult("cr.googleTranslate.translationTime")); |
| - |
| - // Notify the browser we are done. |
| - render_view()->Send(new ChromeViewHostMsg_PageTranslated( |
| - render_view()->GetRoutingID(), render_view()->GetPageId(), |
| - actual_source_lang, target_lang_, TranslateErrors::NONE)); |
| - return; |
| - } |
| + // Check if |page_language| and |cld_language| are in the similar language |
| + // list and belong to the same language group. |
| + int page_code = GetSimilarLanguageGroupCode(page_language); |
| + bool match = page_code != 0 && |
| + page_code == GetSimilarLanguageGroupCode(cld_language); |
| - // The translation is still pending, check again later. |
| - base::MessageLoop::current()->PostDelayedTask( |
| - FROM_HERE, |
| - base::Bind(&TranslateHelper::CheckTranslateStatus, |
| - weak_method_factory_.GetWeakPtr()), |
| - AdjustDelay(kTranslateStatusCheckDelayMs)); |
| + TranslateHelperMetrics::ReportSimilarLanguageMatch(match); |
| + return match; |
| } |
| -void TranslateHelper::TranslatePageImpl(int count) { |
| - DCHECK_LT(count, kMaxTranslateInitCheckAttempts); |
| - if (page_id_ != render_view()->GetPageId() || !render_view()->GetWebView()) |
| - return; |
| - |
| - if (!IsTranslateLibReady()) { |
| - // The library is not ready, try again later, unless we have tried several |
| - // times unsucessfully already. |
| - if (++count >= kMaxTranslateInitCheckAttempts) { |
| - NotifyBrowserTranslationFailed(TranslateErrors::INITIALIZATION_ERROR); |
| - return; |
| - } |
| - base::MessageLoop::current()->PostDelayedTask( |
| - FROM_HERE, |
| - base::Bind(&TranslateHelper::TranslatePageImpl, |
| - weak_method_factory_.GetWeakPtr(), |
| - count), |
| - AdjustDelay(count * kTranslateInitCheckDelayMs)); |
| - return; |
| - } |
| - |
| - // The library is loaded, and ready for translation now. |
| - // Check JavaScript performance counters for UMA reports. |
| - TranslateHelperMetrics::ReportTimeToBeReady( |
| - ExecuteScriptAndGetDoubleResult("cr.googleTranslate.readyTime")); |
| - TranslateHelperMetrics::ReportTimeToLoad( |
| - ExecuteScriptAndGetDoubleResult("cr.googleTranslate.loadTime")); |
| +bool MaybeServerWrongConfiguration(const std::string& page_language, |
| + const std::string& cld_language) { |
| + // If |page_language| is not "en-*", respect it and just return false here. |
| + if (!StartsWithASCII(page_language, "en", false)) |
| + return false; |
| - if (!StartTranslation()) { |
| - NotifyBrowserTranslationFailed(TranslateErrors::TRANSLATION_ERROR); |
| - return; |
| + // A server provides a language meta information representing "en-*". But it |
| + // might be just a default value due to missing user configuration. |
| + // Let's trust |cld_language| if the determined language is not difficult to |
| + // distinguish from English, and the language is one of well-known languages |
| + // which often provide "en-*" meta information mistakenly. |
| + for (size_t i = 0; i < arraysize(kWellKnownCodesOnWrongConfiguration); ++i) { |
| + if (cld_language == kWellKnownCodesOnWrongConfiguration[i]) |
| + return true; |
| } |
| - // Check the status of the translation. |
| - base::MessageLoop::current()->PostDelayedTask( |
| - FROM_HERE, |
| - base::Bind(&TranslateHelper::CheckTranslateStatus, |
| - weak_method_factory_.GetWeakPtr()), |
| - AdjustDelay(kTranslateStatusCheckDelayMs)); |
| -} |
| - |
| -void TranslateHelper::NotifyBrowserTranslationFailed( |
| - TranslateErrors::Type error) { |
| - translation_pending_ = false; |
| - // Notify the browser there was an error. |
| - render_view()->Send(new ChromeViewHostMsg_PageTranslated( |
| - render_view()->GetRoutingID(), page_id_, source_lang_, |
| - target_lang_, error)); |
| + return false; |
| } |
| -WebFrame* TranslateHelper::GetMainFrame() { |
| - WebView* web_view = render_view()->GetWebView(); |
| - |
| - // When the tab is going to be closed, the web_view can be NULL. |
| - if (!web_view) |
| - return NULL; |
| - |
| - return web_view->mainFrame(); |
| -} |
| +} // namespace LanguageDetectionUtil |