diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php index c30d380..8dd8e4a 100644 --- a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php @@ -393,6 +393,7 @@ public static function baseFieldDefinitions($entity_type) { 'label' => t('Subject'), 'description' => t('The comment title or subject.'), 'type' => 'string_field', + 'translatable' => TRUE, ); $properties['uid'] = array( 'label' => t('User ID'), diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index a6cf31c..f4aa7a8 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -600,7 +627,8 @@ function content_translation_form_alter(array &$form, array &$form_state) { if (!$entity->isNew() && (!isset($translations[$form_langcode]) || count($translations) > 1)) { foreach ($entity->getPropertyDefinitions() as $property_name => $definition) { if (isset($form[$property_name])) { - $form[$property_name]['#multilingual'] = !empty($definition['translatable']); + $config = content_translation_get_config($entity->entityType(), $entity->bundle(), 'fields.' . $property_name); + $form[$property_name]['#multilingual'] = !empty($definition['translatable']) && !empty($config); } } } diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php index ecab4c4..a10ad27 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php @@ -113,6 +113,17 @@ function testSettingsUI() { $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type')); $this->drupalGet('admin/structure/types/manage/article'); $this->assertFieldChecked('edit-language-configuration-content-translation'); + + // Test that the title field of nodes is available in the settings form. + $edit = array( + 'entity_types[node]' => TRUE, + 'settings[node][article][settings][language][langcode]' => 'current_interface', + 'settings[node][article][settings][language][language_show]' => TRUE, + 'settings[node][article][translatable]' => TRUE, + 'settings[node][article][fields][title]' => TRUE + ); + $this->assertSettings('node', NULL, TRUE, $edit); + } /** diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/lib/Drupal/node/Entity/Node.php index 8367e16..95f164f 100644 --- a/core/modules/node/lib/Drupal/node/Entity/Node.php +++ b/core/modules/node/lib/Drupal/node/Entity/Node.php @@ -360,6 +360,7 @@ public static function baseFieldDefinitions($entity_type) { 'property_constraints' => array( 'value' => array('Length' => array('max' => 255)), ), + 'translatable' => TRUE, ); $properties['uid'] = array( 'label' => t('User ID'), diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php index 77c0bbd..26d915a 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php @@ -38,7 +38,6 @@ public static function getInfo() { function setUp() { $this->entityType = 'node'; $this->bundle = 'article'; - $this->title = $this->randomName(); parent::setUp(); $this->drupalPlaceBlock('system_help_block', array('region' => 'content')); } @@ -63,7 +62,7 @@ protected function getTranslatorPermissions() { */ protected function getNewEntityValues($langcode) { // Node title is not translatable yet, hence we use a fixed value. - return array('title' => $this->title) + parent::getNewEntityValues($langcode); + return array('title' => $this->randomName()) + parent::getNewEntityValues($langcode); } /**