Generate data packs for all languages and allow us to load

chrome/common/resource_bundle_linux.cc

 // Copyright (c) 2006-2008 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/resource_bundle.h"
 
 #include <gtk/gtk.h>
 
 #include "base/base_paths.h"
 #include "base/data_pack.h"
@@ skipping 21 matching lines @@
 void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
   FilePath resources_data_path;
   PathService::Get(base::DIR_EXE, &resources_data_path);
   resources_data_path = resources_data_path.Append(
       FILE_PATH_LITERAL("chrome.pak"));
   DCHECK(resources_data_ == NULL) << "resource data already loaded!";
   resources_data_ = new base::DataPack;
   bool success = resources_data_->Load(resources_data_path);
   DCHECK(success) << "failed to load chrome.pak";
 
-  FilePath locale_path;
-  PathService::Get(chrome::DIR_LOCALES, &locale_path);
-  // TODO(tc): Handle other locales properly.
-  // http://code.google.com/p/chromium/issues/detail?id=8125
-  locale_path = locale_path.Append(FILE_PATH_LITERAL("en-US.pak"));
   DCHECK(locale_resources_data_ == NULL) << "locale data already loaded!";
+  const FilePath& locale_path = GetLocaleFilePath(pref_locale);
+  if (locale_path.value().empty()) {
+    // It's possible that there are no locale dlls found, in which case we just
+    // return.
+    NOTREACHED();
+    return;

[Evan Martin, 2009/03/06 20:39:53]

Shouldn't we die horribly here?

+  }
+
   locale_resources_data_ = new base::DataPack;
   success = locale_resources_data_->Load(locale_path);
   DCHECK(success) << "failed to load locale pak file";
 }
 
 FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
   FilePath locale_path;
   PathService::Get(chrome::DIR_LOCALES, &locale_path);
 
   const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale);
@@ skipping 75 matching lines @@
   GdkPixbuf* pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
   DCHECK(pixbuf) << "failed to load " << resource_id << " " << data.size();
 
   // The pixbuf is owned by the loader, so add a ref so when we delete the
   // loader, the pixbuf still exists.
   g_object_ref(pixbuf);
   g_object_unref(loader);
 
   return pixbuf;
 }