diff --git c/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php w/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php index 6539027..b1178b7 100644 --- c/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php +++ w/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php @@ -24,8 +24,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $entity = $this->getEntity(); // Make sure that deleting a translation does not delete the whole entity. - if ($entity->language()->getId() != $entity->getUntranslated()->language()->getId()) { - $entity->getUntranslated()->removeTranslation($entity->language()->getId()); + $entity_language_id = $entity->language()->getId(); + if ($entity_language_id != $entity->getUntranslated()->language()->getId()) { + $entity->getUntranslated()->removeTranslation($entity_language_id); $entity->getUntranslated()->save(); } else { diff --git c/core/modules/content_translation/src/ContentTranslationHandler.php w/core/modules/content_translation/src/ContentTranslationHandler.php index 93d6447..9ca6520 100644 --- c/core/modules/content_translation/src/ContentTranslationHandler.php +++ w/core/modules/content_translation/src/ContentTranslationHandler.php @@ -603,8 +603,17 @@ public function entityFormSourceChange($form, FormStateInterface $form_state) { function entityFormDelete($form, FormStateInterface $form_state) { $entity = $form_state->getFormObject()->getEntity(); $is_translation = $entity->language()->getId() != $entity->getUntranslated()->language()->getId(); + $languages = []; + foreach ($entity->getTranslationLanguages() as $language) { + array_push($languages, t('@language', array('@language' => $language->getName()))); + } + $languages = join($languages, ', '); if (count($entity->getTranslationLanguages()) > 1 && !$is_translation) { - drupal_set_message(t('This will delete all the translations of %label.', array('%label' => $entity->label())), 'warning'); + drupal_set_message(t('This will delete the following translations: @languages', + array( + '%label' => $entity->label(), + '@languages' => $languages, + )), 'warning'); } } diff --git c/core/modules/node/src/NodeTranslationHandler.php w/core/modules/node/src/NodeTranslationHandler.php index 4dd1125..ebd064b 100644 --- c/core/modules/node/src/NodeTranslationHandler.php +++ w/core/modules/node/src/NodeTranslationHandler.php @@ -66,7 +66,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En // Change the submit button label for delete forms. if ($is_delete_form) { $is_translation = $entity->language()->getId() != $entity->getUntranslated()->language()->getId() ? TRUE : FALSE; - $form['actions']['submit']['#value'] .= ' ' . ($is_translation ? t('(@language translation)', array('@language' => $entity->language()->getName())) : ''); + $form['actions']['submit']['#value'] .= ' ' . ($is_translation ? t('@language translation', array('@language' => $entity->language()->getName())) : ''); } } }