summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 02:49:26 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 02:49:26 +0000
commit8d022a907bf74f4190fe15ad256c5264b396589e (patch)
tree7f2975e9ed1d6b3ae6a170caeea281325634d619 /chrome
parentc75da645edbe00944e180a3868a7da459d9852ca (diff)
downloadchromium_src-8d022a907bf74f4190fe15ad256c5264b396589e.zip
chromium_src-8d022a907bf74f4190fe15ad256c5264b396589e.tar.gz
chromium_src-8d022a907bf74f4190fe15ad256c5264b396589e.tar.bz2
Use LanguageCodeWithDialects instead of LanguageCode to get 'zh-CN'
instead of 'zh'. This was a part of http://codereview.chromium.org/549123/show (LGTM'd by jcampan by email), but that CL is failing the unittest after the CLD update by jcampan. So, I'm landing this small change first. BUG=32759 TEST=NONE TBR=jcampan Review URL: http://codereview.chromium.org/561065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/render_view.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index a11fe59..872c518 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3170,9 +3170,11 @@ std::string RenderView::DetermineTextLanguage(const std::wstring& text) {
cld_language != TG_UNKNOWN_LANGUAGE) {
// We should not use LanguageCode_ISO_639_1 because it does not cover all
// the languages CLD can detect. As a result, it'll return the invalid
- // language code for tradtional Chinese among others. |LanguageCode| will go
- // through ISO 639-1, ISO-639-2 and 'other' tables to do the 'right' thing.
- language = LanguageCode(cld_language);
+ // language code for tradtional Chinese among others.
+ // |LanguageCodeWithDialect| will go through ISO 639-1, ISO-639-2 and
+ // 'other' tables to do the 'right' thing. In addition, it'll return zh-CN
+ // for Simplified Chinese.
+ language = LanguageCodeWithDialects(cld_language);
}
return language;
}
@@ -4278,4 +4280,3 @@ void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) {
Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window));
}
#endif
-