Allow country-specific languages in UI list at OOBE.

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/chromeos/cros_language_options_handler.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 215 matching lines @@
   LanguageMap language_map;
 
   // The auxiliary vector mentioned above. (except vendor locales)
   std::vector<base::string16> display_names;
 
   // Separate vector of vendor locales.
   std::vector<base::string16> configured_locales_display_names(
       configured_locales.size());
 
   size_t configured_locales_count = 0;
+
   // Build the list of display names, and build the language map.
+
+  // The list of configured locales might have entries not in
+  // base_language_codes. If there are unsupported language variants,
+  // replace them with base language from base_language_codes if supported.
+  for (std::map<std::string, int>::const_iterator iter = language_index.begin();
+       iter != language_index.end();
+       ++iter) {
+    const std::string& language_id = iter->first;
+    const int language_idx = iter->second;
+
+    const size_t dash_pos = language_id.find_first_of('-');
+
+    // Ignore non-specific codes.
+    if (dash_pos == std::string::npos || dash_pos == 0)
+      continue;
+
+    if (std::find(base_language_codes.begin(),
+                  base_language_codes.end(),
+                  language_id) != base_language_codes.end()) {
+      // Language is supported. No need to replace
+      continue;
+    }
+    const std::string base_language_code = language_id.substr(0, dash_pos);

[Alexander Alekseev, 2014/04/07 19:28:58]

This doesn't work for en_AU, because fallback is en_GB.
So I used CheckAndResolveLocale here.

+    if (std::find(base_language_codes.begin(),
+                  base_language_codes.end(),
+                  base_language_code) == base_language_codes.end()) {
+      // Base language is not supported.
+      continue;
+    }
+
+    const base::string16 display_name =
+        l10n_util::GetDisplayNameForLocale(language_id, app_locale, true);
+    const base::string16 native_display_name =
+        l10n_util::GetDisplayNameForLocale(
+            language_id, language_id, true);
+
+    language_map[display_name] =
+        std::make_pair(language_id, native_display_name);
+
+    configured_locales_display_names[language_idx] = display_name;
+    ++configured_locales_count;
+  }
+
+  // Translate language codes, generated from input methods.
   for (std::set<std::string>::const_iterator iter = language_codes.begin();
        iter != language_codes.end(); ++iter) {
      // Exclude the language which is not in |base_langauge_codes| even it has
      // input methods.
     if (std::find(base_language_codes.begin(),
                   base_language_codes.end(),
                   *iter) == base_language_codes.end()) {
       continue;
     }
 
     const base::string16 display_name =
         l10n_util::GetDisplayNameForLocale(*iter, app_locale, true);
     const base::string16 native_display_name =
         l10n_util::GetDisplayNameForLocale(*iter, *iter, true);
 
     language_map[display_name] =
         std::make_pair(*iter, native_display_name);
 
     const std::map<std::string, int>::const_iterator index_pos =
         language_index.find(*iter);
     if (index_pos != language_index.end()) {
-      configured_locales_display_names[index_pos->second] = display_name;
-      ++configured_locales_count;
+      base::string16& stored_display_name =
+          configured_locales_display_names[index_pos->second];
+      if (stored_display_name.empty()) {
+        stored_display_name = display_name;
+        ++configured_locales_count;
+      }
     } else {
       display_names.push_back(display_name);
     }
   }
   DCHECK_EQ(display_names.size() + configured_locales_count,
             language_map.size());
 
   // Build the list of display names, and build the language map.
   for (size_t i = 0; i < base_language_codes.size(); ++i) {
     // Skip this language if it was already added.
@@ skipping 222 matching lines @@
       ConvertInputMethodDescriptosToIMEList(
           component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
   web_ui()->CallJavascriptFunction(
       "options.LanguageOptions.onComponentManagerInitialized",
       *ime_list);
   composition_extension_appended_ = true;
 }
 
 }  // namespace options
 }  // namespace chromeos