diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php index c049c92..ed7c55d 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php @@ -108,5 +108,4 @@ public function onChange($property_name) { } parent::onChange($property_name); } - } diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php index a3e143f..fac11ed 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php @@ -53,7 +53,7 @@ public function form(array $form, array &$form_state) { '#description' => t('Create a new revision by default for this block type.') ); - if (module_exists('content_translation')) { + if ($this->moduleHandler->moduleExists('language')) { $form['language'] = array( '#type' => 'details', '#title' => t('Language settings'), diff --git a/core/modules/language/language.module b/core/modules/language/language.module index a11cd96..ee961d6 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -289,7 +289,17 @@ function language_configuration_element_submit(&$form, &$form_state) { // values. if (isset($form_state['language'])) { foreach ($form_state['language'] as $element_name => $values) { - language_save_default_configuration($values['entity_type'], $values['bundle'], $form_state['values'][$element_name]); + // When creating a new bundle, bundle key is empty, as it was not set on + // form creation. + if (!isset($values['bundle'])) { + $values['bundle'] = $form_state['controller']->getEntity()->id(); + } + // When renaming the bundle, old config values has to be deleted. + elseif ($values['bundle'] != $form_state['controller']->getEntity()->id()) { + language_clear_default_configuration($values['entity_type'], $values['bundle']); + $values['bundle'] = $form_state['controller']->getEntity()->id(); + } + language_save_default_configuration($values['entity_type'], $values['bundle'], $form_state['values'][$element_name]); } } } @@ -366,16 +376,6 @@ function language_get_default_configuration_settings_key($entity_type, $bundle) } /** - * Implements hook_node_type_update(). - */ -function language_node_type_update(NodeTypeInterface $type) { - if ($type->original->id() != $type->id()) { - language_save_default_configuration('node', $type->id(), language_get_default_configuration('node', $type->original->id())); - language_clear_default_configuration('node', $type->original->id()); - } -} - -/** * Returns the default language code assigned to an entity type and a bundle. * * @param string $entity_type @@ -425,15 +425,6 @@ function language_get_default_langcode($entity_type, $bundle) { } /** - * Implements hook_node_type_insert(). - */ -function language_node_type_insert(NodeTypeInterface $type) { - if (!empty($type->language_configuration)) { - language_save_default_configuration('node', $type->id(), $type->language_configuration); - } -} - -/** * API function to add or update a language. * * @param $language