Issue #3329066 by dabblela, quietone, joseph.olstad, smustgrave, catch,... (86ce2753) · Commits · project / drupal

core/modules/content_translation/src/Controller/ContentTranslationController.php

+27 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,33 @@ public static function create(ContainerInterface $container) {
		*/
		public function prepareTranslation(ContentEntityInterface $entity, LanguageInterface $source, LanguageInterface $target) {
		$source_langcode = $source->getId();
		/** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
		$storage = $this->entityTypeManager()->getStorage($entity->getEntityTypeId());

		// Once translations from the default revision are added, there may be
		// additional draft translations that don't exist in the default revision.
		// Add those translations too so that they aren't deleted when the new
		// translation is saved.
		/** @var \Drupal\Core\Entity\ContentEntityInterface $default_revision */
		$default_revision = $storage->load($entity->id());
		// Check the entity isn't missing any translations.
		$languages = $this->languageManager()->getLanguages();
		foreach ($languages as $language) {
		$langcode = $language->getId();
		if ($entity->hasTranslation($langcode) \|\| $target->getId() === $langcode) {
		continue;
		}
		$latest_revision_id = $storage->getLatestTranslationAffectedRevisionId($entity->id(), $langcode);
		if ($latest_revision_id) {
		if ($default_revision->hasTranslation($langcode)) {
		$existing_translation = $default_revision->getTranslation($langcode);
		$existing_translation->setNewRevision(FALSE);
		$existing_translation->isDefaultRevision(FALSE);
		$existing_translation->setRevisionTranslationAffected(FALSE);
		$entity->addTranslation($langcode, $existing_translation->toArray());
		}
		}
		}
		/** @var \Drupal\Core\Entity\ContentEntityInterface $source_translation */
		$source_translation = $entity->getTranslation($source_langcode);
		$target_translation = $entity->addTranslation($target->getId(), $source_translation->toArray());

core/modules/content_translation/tests/modules/content_translation_test/content_translation_test.module

+7 −0

Original line number	Diff line number	Diff line
		@@ -68,3 +68,10 @@ function content_translation_test_form_node_form_alter(&$form, FormStateInterfac
		function content_translation_test_form_node_form_submit($form, FormStateInterface $form_state) {
		\Drupal::state()->set('test_field_only_en_fr', $form_state->getValue('test_field_only_en_fr'));
		}

		/**
		* Implements hook_entity_translation_delete().
		*/
		function content_translation_test_entity_translation_delete(EntityInterface $translation) {
		\Drupal::state()->set('content_translation_test.translation_deleted', TRUE);
		}

core/modules/content_translation/tests/src/Functional/ContentTranslationNewTranslationWithExistingRevisionsTest.php

0 → 100644

+170 −0

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Tests\content_translation\Functional;

		use Drupal\Core\Url;
		use Drupal\language\Entity\ConfigurableLanguage;

		/**
		* Tests that new translations do not delete existing ones.
		*
		* @group content_translation
		*/
		class ContentTranslationNewTranslationWithExistingRevisionsTest extends ContentTranslationPendingRevisionTestBase {

		/**
		* {@inheritdoc}
		*/
		protected static $modules = [
		'content_moderation',
		'content_translation',
		'content_translation_test',
		'language',
		'node',
		];

		/**
		* {@inheritdoc}
		*/
		protected $defaultTheme = 'stark';

		/**
		* {@inheritdoc}
		*/
		protected function setUp(): void {
		parent::setUp();
		$this->enableContentModeration();
		}

		/**
		* Tests a translation with a draft is not deleted.
		*/
		public function testDraftTranslationIsNotDeleted() {
		$this->drupalLogin($this->translator);

		// Create a test node.
		$values = [
		'title' => "Test EN",
		'moderation_state' => 'published',
		];
		$id = $this->createEntity($values, 'en');
		/** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
		$entity = $this->storage->load($id);

		// Add a published translation.
		$add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add",
		[
		$entity->getEntityTypeId() => $id,
		'source' => 'en',
		'target' => 'it',
		],
		[
		'language' => ConfigurableLanguage::load('it'),
		'absolute' => FALSE,
		]
		);
		$this->drupalGet($add_translation_url);
		$edit = [
		'title[0][value]' => "Test IT",
		'moderation_state[0][state]' => 'published',
		];
		$this->submitForm($edit, 'Save (this translation)');
		$it_revision = $this->loadRevisionTranslation($entity, 'it');

		// Add a draft translation.
		$this->drupalGet($this->getEditUrl($it_revision));
		$edit = [
		'title[0][value]' => "Test IT 2",
		'moderation_state[0][state]' => 'draft',
		];
		$this->submitForm($edit, 'Save (this translation)');

		// Add a new draft translation.
		$add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add",
		[
		$entity->getEntityTypeId() => $id,
		'source' => 'en',
		'target' => 'fr',
		],
		[
		'language' => ConfigurableLanguage::load('fr'),
		'absolute' => FALSE,
		]
		);
		$this->drupalGet($add_translation_url);
		$edit = [
		'title[0][value]' => "Test FR",
		'moderation_state[0][state]' => 'published',
		];
		$this->submitForm($edit, 'Save (this translation)');
		// Check the first translation still exists.
		$entity = $this->storage->loadUnchanged($id);
		$this->assertTrue($entity->hasTranslation('it'));
		}

		/**
		* Test translation delete hooks are not invoked.
		*/
		public function testCreatingNewDraftDoesNotInvokeDeleteHook() {
		$this->drupalLogin($this->translator);

		// Create a test node.
		$values = [
		'title' => "Test EN",
		'moderation_state' => 'published',
		];
		$id = $this->createEntity($values, 'en');
		/** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
		$entity = $this->storage->load($id);

		// Add a published translation.
		$add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add",
		[
		$entity->getEntityTypeId() => $id,
		'source' => 'en',
		'target' => 'it',
		],
		[
		'language' => ConfigurableLanguage::load('it'),
		'absolute' => FALSE,
		]
		);
		$this->drupalGet($add_translation_url);
		$edit = [
		'title[0][value]' => "Test IT",
		'moderation_state[0][state]' => 'published',
		];
		$this->submitForm($edit, 'Save (this translation)');
		$it_revision = $this->loadRevisionTranslation($entity, 'it');

		// Add a draft translation.
		$this->drupalGet($this->getEditUrl($it_revision));
		$edit = [
		'title[0][value]' => "Test IT 2",
		'moderation_state[0][state]' => 'draft',
		];
		$this->submitForm($edit, 'Save (this translation)');
		// Add a new draft translation.
		$add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add",
		[
		$entity->getEntityTypeId() => $id,
		'source' => 'en',
		'target' => 'fr',
		],
		[
		'language' => ConfigurableLanguage::load('fr'),
		'absolute' => FALSE,
		]
		);
		$this->drupalGet($add_translation_url);
		$edit = [
		'title[0][value]' => "Test FR",
		'moderation_state[0][state]' => 'draft',
		];
		$this->submitForm($edit, 'Save (this translation)');
		// If the translation delete hook was incorrectly invoked, the state
		// variable would be set.
		$this->assertNull($this->container->get('state')->get('content_translation_test.translation_deleted'));
		}

		}