diff --git a/core/modules/language/lib/Drupal/language/Config/LanguageConfigFactoryOverride.php b/core/modules/language/lib/Drupal/language/Config/LanguageConfigFactoryOverride.php index 76fb349..4c678ff 100644 --- a/core/modules/language/lib/Drupal/language/Config/LanguageConfigFactoryOverride.php +++ b/core/modules/language/lib/Drupal/language/Config/LanguageConfigFactoryOverride.php @@ -8,6 +8,7 @@ namespace Drupal\language\Config; use Drupal\Core\Config\Config; +use Drupal\Core\Config\FileStorage; use Drupal\Core\Config\StorageInterface; use Drupal\Core\Config\TypedConfigManagerInterface; use Drupal\Core\Language\Language; @@ -67,7 +68,9 @@ public function __construct(LanguageOverrideStorageInterface $storage, EventDisp * {@inheritdoc} */ public function loadOverrides($names) { - return $this->storage->readMultiple($names); + if ($this->language) { + return $this->storage->readMultiple($names); + } } /** @@ -118,6 +121,7 @@ public function setLanguage(Language $language = NULL) { */ public function setLanguageFromDefault(LanguageDefault $language_default = NULL) { $this->language = $language_default ? $language_default->get() : NULL; + $this->storage->setLangcode($this->language->id); return $this; } @@ -139,7 +143,7 @@ public function install($type, $name) { $this->storage->setLangcode($dir->getFilename()); foreach ($default_language_config->listAll() as $config_name) { $data = $default_language_config->read($config_name); - $config = new LanguageConfigOverride($config_name, $this->storage, $this->typedConfig); + $config = new LanguageConfigOverride($config_name, $this->storage, $this->typedConfigManager); $config->setData($data)->save(); } } diff --git a/core/modules/language/lib/Drupal/language/Config/LanguageConfigOverride.php b/core/modules/language/lib/Drupal/language/Config/LanguageConfigOverride.php index 5648187..6ed2b11 100644 --- a/core/modules/language/lib/Drupal/language/Config/LanguageConfigOverride.php +++ b/core/modules/language/lib/Drupal/language/Config/LanguageConfigOverride.php @@ -24,7 +24,7 @@ class LanguageConfigOverride extends StorableConfigBase { * @param \Drupal\Core\Config\StorageInterface $storage * A storage controller object to use for reading and writing the * configuration override. - * @param \Drupal\Core\Config\TypedConfigManager $typed_config + * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config * The typed configuration manager service. */ public function __construct($name, StorageInterface $storage, TypedConfigManagerInterface $typed_config) {