Translate: Bug fix: Remove the language sub code when merging to the blocked language list

chrome/browser/translate/translate_prefs.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/translate/translate_prefs.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 26 matching lines @@
 
   const char* key = TranslatePrefs::kPrefTranslateLanguageBlacklist;
   const ListValue* list = prefs->GetList(key);
   for (ListValue::const_iterator it = list->begin(); it != list->end(); ++it) {
     std::string lang;
     (*it)->GetAsString(&lang);
     languages->push_back(lang);
   }
 }
 
+// Converts the language code for Translate. This removes the sub code (like
+// -US) except for Chinese, and converts the synonyms.

[Takashi Toyoshima, 2013/09/06 06:20:21]

Please add a comment to be consistent with language_options.js.

[hajimehoshi, 2013/09/06 06:29:18]

Done.

+std::string ConvertLangCodeForTranslation(const std::string &lang) {
+  std::vector<std::string> tokens;
+  base::SplitString(lang, '-', &tokens);
+  if (tokens.size() < 1)
+    NOTREACHED();
+
+  std::string main_part = tokens[0];
+
+  // Translate doesn't support General Chinese and the sub code is necessary.
+  if (main_part == "zh")
+    return lang;
+
+  TranslateUtil::ToTranslateLanguageSynonym(&main_part);
+  return main_part;
+}
+
 }  // namespace
 
 namespace {
 
 void AppendLanguageToAcceptLanguages(PrefService* prefs,
                                      const std::string& language) {
   if (!TranslateAcceptLanguages::CanBeAcceptLanguage(language))
     return;
 
   std::string accept_language = language;
@@ skipping 326 matching lines @@
     result.insert(*it);
   }
 
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   std::string ui_lang = TranslateManager::GetLanguageCode(app_locale);
   bool is_ui_english = ui_lang == "en" ||
       StartsWithASCII(ui_lang, "en-", false);
 
   for (std::vector<std::string>::const_iterator it = accept_languages.begin();
        it != accept_languages.end(); ++it) {
-    std::string lang = *it;
-    TranslateUtil::ToTranslateLanguageSynonym(&lang);
+    std::string converted_lang = ConvertLangCodeForTranslation(*it);
 
     // Regarding http://crbug.com/36182, even though English exists in Accept
     // language list, English could be translated on non-English locale.
-    if (lang == "en" && !is_ui_english)
+    if (converted_lang == "en" && !is_ui_english)
       continue;
 
-    result.insert(lang);
+    result.insert(converted_lang);
   }
 
   blocked_languages->insert(blocked_languages->begin(),
                             result.begin(), result.end());
 }
 
 bool TranslatePrefs::IsValueInList(const ListValue* list,
     const std::string& in_value) const {
   for (size_t i = 0; i < list->GetSize(); ++i) {
     std::string value;
@@ skipping 46 matching lines @@
 
 bool TranslatePrefs::IsListEmpty(const char* pref_id) const {
   const ListValue* blacklist = prefs_->GetList(pref_id);
   return (blacklist == NULL || blacklist->empty());
 }
 
 bool TranslatePrefs::IsDictionaryEmpty(const char* pref_id) const {
   const DictionaryValue* dict = prefs_->GetDictionary(pref_id);
   return (dict == NULL || dict->empty());
 }