[Translate] Apply language synonyms to the target language

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 <set>
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 29 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.
-// The same logic exists at language_options.js, and please keep consistensy
-// with the JavaScript file.
-std::string ConvertLangCodeForTranslation(const std::string &lang) {
-  std::vector<std::string> tokens;
-  base::SplitString(lang, '-', &tokens);
-  if (tokens.size() < 1)
-    return lang;
-
-  std::string main_part = tokens[0];
-
-  // Translate doesn't support General Chinese and the sub code is necessary.
-  if (main_part == "zh")
-    return lang;
-
-  translate::ToTranslateLanguageSynonym(&main_part);
-  return main_part;
-}
-
 // Expands language codes to make these more suitable for Accept-Language.
 // Example: ['en-US', 'ja', 'en-CA'] => ['en-US', 'en', 'ja', 'en-CA'].
 // 'en' won't appear twice as this function eliminates duplicates.
 void ExpandLanguageCodes(const std::vector<std::string>& languages,
                          std::vector<std::string>* expanded_languages) {
   DCHECK(expanded_languages);
   DCHECK(expanded_languages->empty());
 
   // used to eliminate duplicates.
   std::set<std::string> seen;
@@ skipping 384 matching lines @@
     if (converted_lang == "en" && !is_ui_english)
       continue;
 
     result.insert(converted_lang);
   }
 
   blocked_languages->insert(blocked_languages->begin(),
                             result.begin(), result.end());
 }
 
+// static
+std::string TranslatePrefs::ConvertLangCodeForTranslation(
+    const std::string &lang) {
+  std::vector<std::string> tokens;
+  base::SplitString(lang, '-', &tokens);
+  if (tokens.size() < 1)
+    return lang;
+
+  std::string main_part = tokens[0];
+
+  // Translate doesn't support General Chinese and the sub code is necessary.
+  if (main_part == "zh")
+    return lang;
+
+  translate::ToTranslateLanguageSynonym(&main_part);
+  return main_part;
+}
+
 bool TranslatePrefs::IsValueInList(const ListValue* list,
     const std::string& in_value) const {
   for (size_t i = 0; i < list->GetSize(); ++i) {
     std::string value;
     if (list->GetString(i, &value) && value == in_value)
       return true;
   }
   return false;
 }
 
@@ skipping 40 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());
 }