diff --git a/core/modules/language/config/schema/language.schema.yml b/core/modules/language/config/schema/language.schema.yml index 204b9b0..f396d42 100644 --- a/core/modules/language/config/schema/language.schema.yml +++ b/core/modules/language/config/schema/language.schema.yml @@ -111,7 +111,7 @@ language.content_settings.*.*: target_entity_type_id: type: string label: 'Entity Type ID' - bundle: + target_bundle: type: string label: 'Bundle' default_langcode: diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php index d4a90d6..28d60b1 100644 --- a/core/modules/language/src/Entity/ContentLanguageSettings.php +++ b/core/modules/language/src/Entity/ContentLanguageSettings.php @@ -31,7 +31,7 @@ class ContentLanguageSettings extends ConfigEntityBase { use ThirdPartySettingsTrait; /** - * The id. Combination of $entity_type.$bundle. + * The id. Combination of $target_entity_type_id.$target_bundle. * * @var string */ @@ -49,7 +49,7 @@ class ContentLanguageSettings extends ConfigEntityBase { * * @var string */ - protected $bundle; + protected $target_bundle; /** * The default language code. @@ -69,7 +69,7 @@ class ContentLanguageSettings extends ConfigEntityBase { * {@inheritdoc} */ public function id() { - return $this->target_entity_type_id . '.' . $this->bundle; + return $this->target_entity_type_id . '.' . $this->target_bundle; } /** @@ -85,8 +85,8 @@ public function getTargetEntityTypeId() { * Gets the bundle this config applies to. * @return string */ - public function getBundle() { - return $this->bundle; + public function getTargetBundle() { + return $this->target_bundle; } /** @@ -168,7 +168,7 @@ public function differsFromDefaultConfiguration() { public static function loadByEntityTypeBundle($entity_type_id, $bundle) { $config = \Drupal::entityManager()->getStorage('language_content_settings')->load($entity_type_id . '.' . $bundle); if ($config == NULL) { - $config = ContentLanguageSettings::create(['target_entity_type_id' => $entity_type_id, 'bundle' => $bundle]); + $config = ContentLanguageSettings::create(['target_entity_type_id' => $entity_type_id, 'target_bundle' => $bundle]); } return $config; }