Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / content_translation / src / Controller / ContentTranslationController.php

diff --git a/web/core/modules/content_translation/src/Controller/ContentTranslationController.php b/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
index 3f5891b73a8514ffed987bb71e382c24c32c8c14..e5af1c31f43c0b309c600abcc26eba34b84c76ed 100644 (file)
--- a/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
+++ b/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
@@ -145,37 +145,14 @@ class ContentTranslationController extends ControllerBase {
           $translations = $entity->getTranslationLanguages();
         }
 
-        $add_url = new Url(
-          "entity.$entity_type_id.content_translation_add",
-          [
-            'source' => $original,
-            'target' => $language->getId(),
-            $entity_type_id => $entity->id(),
-          ],
-          [
-            'language' => $language,
-          ]
-        );
-        $edit_url = new Url(
-          "entity.$entity_type_id.content_translation_edit",
-          [
-            'language' => $language->getId(),
-            $entity_type_id => $entity->id(),
-          ],
-          [
-            'language' => $language,
-          ]
-        );
-        $delete_url = new Url(
-          "entity.$entity_type_id.content_translation_delete",
-          [
-            'language' => $language->getId(),
-            $entity_type_id => $entity->id(),
-          ],
-          [
-            'language' => $language,
-          ]
-        );
+        $options = ['language' => $language];
+        $add_url = $entity->toUrl('drupal:content-translation-add', $options)
+          ->setRouteParameter('source', $original)
+          ->setRouteParameter('target', $language->getId());
+        $edit_url = $entity->toUrl('drupal:content-translation-edit', $options)
+          ->setRouteParameter('language', $language->getId());
+        $delete_url = $entity->toUrl('drupal:content-translation-delete', $options)
+          ->setRouteParameter('language', $language->getId());
         $operations = [
           'data' => [
             '#type' => 'operations',