Add utility function to determine if a locale is valid syntax; this will...

chrome/common/extensions/extension_l10n_util.cc

 // Copyright (c) 2009 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/common/extensions/extension_l10n_util.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 149 matching lines @@
     valid_locales->insert(locale_name);
   } else {
     *error = base::StringPrintf("Catalog file is missing for locale %s.",
                                 locale_name.c_str());
     return false;
   }
 
   return true;
 }
 
-std::string NormalizeLocale(const std::string& locale) {
-  std::string normalized_locale(locale);
-  std::replace(normalized_locale.begin(), normalized_locale.end(), '-', '_');
-
-  return normalized_locale;
-}
-
 std::string CurrentLocaleOrDefault() {
-  std::string current_locale = NormalizeLocale(*GetProcessLocale());
+  std::string current_locale = l10n_util::NormalizeLocale(*GetProcessLocale());
   if (current_locale.empty())
     current_locale = "en";
 
   return current_locale;
 }
 
-void GetParentLocales(const std::string& current_locale,
-                      std::vector<std::string>* parent_locales) {
-  std::string locale(NormalizeLocale(current_locale));
-
-  const int kNameCapacity = 256;
-  char parent[kNameCapacity];
-  base::strlcpy(parent, locale.c_str(), kNameCapacity);
-  parent_locales->push_back(parent);
-  UErrorCode err = U_ZERO_ERROR;
-  while (uloc_getParent(parent, parent, kNameCapacity, &err) > 0) {
-    if (U_FAILURE(err))
-      break;
-    parent_locales->push_back(parent);
-  }
-}
-
 void GetAllLocales(std::set<std::string>* all_locales) {
   const std::vector<std::string>& available_locales =
       l10n_util::GetAvailableLocales();
   // Add all parents of the current locale to the available locales set.
   // I.e. for sr_Cyrl_RS we add sr_Cyrl_RS, sr_Cyrl and sr.
   for (size_t i = 0; i < available_locales.size(); ++i) {
     std::vector<std::string> result;
-    GetParentLocales(available_locales[i], &result);
+    l10n_util::GetParentLocales(available_locales[i], &result);
     all_locales->insert(result.begin(), result.end());
   }
 }
 
 bool GetValidLocales(const FilePath& locale_path,
                      std::set<std::string>* valid_locales,
                      std::string* error) {
   static std::set<std::string> chrome_locales;
   GetAllLocales(&chrome_locales);
 
@@ skipping 14 matching lines @@
     }
   }
 
   if (valid_locales->empty()) {
     *error = extension_manifest_errors::kLocalesNoValidLocaleNamesListed;
     return false;
   }
 
   return true;
 }
+
 // Loads contents of the messages file for given locale. If file is not found,
 // or there was parsing error we return NULL and set |error|.
 // Caller owns the returned object.
 static DictionaryValue* LoadMessageFile(const FilePath& locale_path,
                                         const std::string& locale,
                                         std::string* error) {
   std::string extension_locale = locale;
   FilePath file = locale_path.AppendASCII(extension_locale)
       .Append(Extension::kMessagesFilename);
   JSONFileValueSerializer messages_serializer(file);
@@ skipping 10 matching lines @@
 
 ExtensionMessageBundle* LoadMessageCatalogs(
     const FilePath& locale_path,
     const std::string& default_locale,
     const std::string& application_locale,
     const std::set<std::string>& valid_locales,
     std::string* error) {
   // Order locales to load as current_locale, first_parent, ..., default_locale.
   std::vector<std::string> all_fallback_locales;
   if (!application_locale.empty() && application_locale != default_locale)
-    GetParentLocales(application_locale, &all_fallback_locales);
+    l10n_util::GetParentLocales(application_locale, &all_fallback_locales);
   all_fallback_locales.push_back(default_locale);
 
   std::vector<linked_ptr<DictionaryValue> > catalogs;
   for (size_t i = 0; i < all_fallback_locales.size(); ++i) {
     // Skip all parent locales that are not supplied.
     if (valid_locales.find(all_fallback_locales[i]) == valid_locales.end())
       continue;
     linked_ptr<DictionaryValue> catalog(
       LoadMessageFile(locale_path, all_fallback_locales[i], error));
     if (!catalog.get()) {
@@ skipping 21 matching lines @@
   if (std::find(subdir.begin(), subdir.end(), L'.') != subdir.end())
     return true;
 
   if (all_locales.find(WideToASCII(subdir)) == all_locales.end())
     return true;
 
   return false;
 }
 
 }  // namespace extension_l10n_util