diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php index a0a2835..71b2809 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php @@ -36,6 +36,8 @@ * * @param \Drupal\Core\Field\EntityReferenceFieldItemListInterface $items * The item list. + * @param $langcode + * The language code of entities. * * @return \Drupal\Core\Entity\EntityInterface[] * The array of referenced entities to display, keyed by delta. diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php index f72a4de..b30dc4d 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php +++ b/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php @@ -10,6 +10,7 @@ use Drupal\language\Entity\ConfigurableLanguage; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\simpletest\WebTestBase; +use Symfony\Component\Validator\Constraints\False; /** * Tests the translation of entity reference field display on nodes. @@ -18,6 +19,12 @@ */ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase { /** + * The option for untranslatable reference fields. + * + * @var bool + */ + protected $translatable = TRUE; + /** * The langcode of the source language. * * @var string @@ -188,7 +195,7 @@ protected function setUpEntityReferenceField() { 'entity_type' => $this->testEntityTypeName, 'type' => 'entity_reference', 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED, - 'translatable' => TRUE, + 'translatable' => $this->translatable, 'settings' => array( 'allowed_values' => array( array( diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFieldUntranslatedReferenceViewTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceFieldUntranslatedReferenceViewTest.php new file mode 100644 index 0000000..01a7d54 --- /dev/null +++ b/core/modules/entity_reference/src/Tests/EntityReferenceFieldUntranslatedReferenceViewTest.php @@ -0,0 +1,24 @@ +isEmpty()) { $default_image = $this->getFieldSetting('default_image'); diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php index 4b828cf..93f2f83 100644 --- a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php +++ b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php @@ -83,7 +83,7 @@ protected function enableTranslation() { * (optional) If TRUE, create a translatable term reference field. Defaults * to FALSE. */ - protected function setUpTermReferenceField($translatable = FALSE) { + protected function setUpTermReferenceField() { $handler_settings = array( 'target_bundles' => array( $this->vocabulary->id() => $this->vocabulary->id(), @@ -92,7 +92,7 @@ protected function setUpTermReferenceField($translatable = FALSE) { ); $this->createEntityReferenceField('node', 'article', $this->termFieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED); $field_storage = FieldStorageConfig::loadByName('node', $this->termFieldName); - $field_storage->setTranslatable($translatable); + $field_storage->setTranslatable(FALSE); $field_storage->save(); entity_get_form_display('node', 'article', 'default')