Loading local resources uses improved fallback algorithm....

chrome/browser/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/browser/extensions/extension_l10n_util.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 44 matching lines @@
     valid_locales->insert(locale_name);
   } else {
     *error = StringPrintf("Catalog file is missing for locale %s.",
                           locale_name.c_str());
     return false;
   }
 
   return true;
 }
 
-// Converts all - into _, to be consistent with ICU and file system names.
-static std::string NormalizeLocale(const std::string& locale) {
+std::string NormalizeLocale(const std::string& locale) {
   std::string normalized_locale(locale);
   std::replace(normalized_locale.begin(), normalized_locale.end(), '-', '_');
 
   return normalized_locale;
 }
 
-// Produce a vector of parent locales for given locale.
-// It includes the current locale in the result.
-// sr_Cyrl_RS generates sr_Cyrl_RS, sr_Cyrl and sr.
-static void GetParentLocales(const std::string& current_locale,
-                             std::vector<std::string>* parent_locales) {
+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];
   strncpy(parent, locale.c_str(), kNameCapacity);
   parent_locales->push_back(parent);
   UErrorCode err = U_ZERO_ERROR;
   while (uloc_getParent(parent, parent, kNameCapacity, &err) > 0) {
     if (err != U_ZERO_ERROR)
       break;
@@ skipping 92 matching lines @@
       // an error.
       return false;
     } else {
       catalogs.push_back(catalog);
     }
   }
 
   return ExtensionMessageBundle::Create(catalogs, error);
 }
 
-FilePath GetL10nRelativePath(const FilePath& relative_resource_path) {
-  // Get locale relative path.
-  static std::string current_locale = l10n_util::GetApplicationLocale(L"");
-  std::replace(current_locale.begin(), current_locale.end(), '-', '_');
+void GetL10nRelativePaths(const FilePath& relative_resource_path,
+                          std::vector<FilePath>* l10n_paths) {
+  DCHECK(NULL != l10n_paths);
+
+  std::vector<std::string> locales;
+  static const std::string current_locale =
+    l10n_util::GetApplicationLocale(L"");
+  GetParentLocales(current_locale, &locales);
 
   FilePath locale_relative_path;
-  return locale_relative_path
-      .AppendASCII(Extension::kLocaleFolder)
-      .AppendASCII(current_locale)
-      .Append(relative_resource_path);
+  for (size_t i = 0; i < locales.size(); ++i) {
+    l10n_paths->push_back(locale_relative_path
+        .AppendASCII(Extension::kLocaleFolder)
+        .AppendASCII(locales[i])
+        .Append(relative_resource_path));
+  }
 }
 
 }  // namespace extension_l10n_util