| Index: chrome/common/extensions/extension.cc
|
| ===================================================================
|
| --- chrome/common/extensions/extension.cc (revision 25781)
|
| +++ chrome/common/extensions/extension.cc (working copy)
|
| @@ -615,17 +615,27 @@
|
| return false;
|
| }
|
|
|
| - // Initialize name.
|
| + // Initialize & localize name.
|
| if (!source.GetString(keys::kName, &name_)) {
|
| *error = errors::kInvalidName;
|
| return false;
|
| + } else if (message_bundle_.get()) {
|
| + std::string l10n_name =
|
| + message_bundle_->GetL10nMessage(ExtensionMessageBundle::kExtensionName);
|
| + if (!l10n_name.empty())
|
| + name_ = l10n_name;
|
| }
|
|
|
| - // Initialize description (if present).
|
| + // Initialize & localize description (if present).
|
| if (source.HasKey(keys::kDescription)) {
|
| if (!source.GetString(keys::kDescription, &description_)) {
|
| *error = errors::kInvalidDescription;
|
| return false;
|
| + } else if (message_bundle_.get()) {
|
| + std::string l10n_description = message_bundle_->GetL10nMessage(
|
| + ExtensionMessageBundle::kExtensionDescription);
|
| + if (!l10n_description.empty())
|
| + description_ = l10n_description;
|
| }
|
| }
|
|
|
| @@ -986,18 +996,6 @@
|
| }
|
| }
|
|
|
| - // Initialize default locale (if present).
|
| - if (source.HasKey(keys::kDefaultLocale)) {
|
| - std::string default_locale;
|
| - if (!source.GetString(keys::kDefaultLocale, &default_locale)) {
|
| - *error = errors::kInvalidDefaultLocale;
|
| - return false;
|
| - }
|
| - // Normalize underscores to hyphens.
|
| - std::replace(default_locale.begin(), default_locale.end(), '_', '-');
|
| - set_default_locale(default_locale);
|
| - }
|
| -
|
| // Chrome URL overrides (optional)
|
| if (source.HasKey(keys::kChromeURLOverrides)) {
|
| DictionaryValue* overrides;
|
|
|