From de764ba9a1fec61862e86523010fbe9c4df066f7 Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Mon, 4 Aug 2014 10:03:12 -0700
Subject: [PATCH] Issue #2314865 by Crell: Standardize contact entity route
 names.

---
 core/modules/contact/contact.links.task.yml  | 6 +++---
 core/modules/contact/contact.routing.yml     | 4 ++--
 core/modules/contact/src/Entity/Category.php | 4 ++--
 core/modules/contact/src/Entity/Message.php  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/modules/contact/contact.links.task.yml b/core/modules/contact/contact.links.task.yml
index e613a8395ee3..687ade5f0167 100644
--- a/core/modules/contact/contact.links.task.yml
+++ b/core/modules/contact/contact.links.task.yml
@@ -1,7 +1,7 @@
-contact.category_edit:
+entity.contact_category.edit_form:
   title: 'Edit'
-  route_name: contact.category_edit
-  base_route: contact.category_edit
+  route_name: entity.contact_category.edit_form
+  base_route: entity.contact_category.edit_form
 
 contact.personal_page:
   title: 'Contact'
diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml
index 45d800d4871f..c6cfef6dc6b9 100644
--- a/core/modules/contact/contact.routing.yml
+++ b/core/modules/contact/contact.routing.yml
@@ -1,4 +1,4 @@
-contact.category_delete:
+entity.contact_category.delete_form:
   path: '/admin/structure/contact/manage/{contact_category}/delete'
   defaults:
     _entity_form: 'contact_category.delete'
@@ -22,7 +22,7 @@ contact.category_add:
   requirements:
     _permission: 'administer contact forms'
 
-contact.category_edit:
+entity.contact_category.edit_form:
   path: '/admin/structure/contact/manage/{contact_category}'
   defaults:
     _entity_form: 'contact_category.edit'
diff --git a/core/modules/contact/src/Entity/Category.php b/core/modules/contact/src/Entity/Category.php
index cc0e6d879401..021456d67864 100644
--- a/core/modules/contact/src/Entity/Category.php
+++ b/core/modules/contact/src/Entity/Category.php
@@ -35,8 +35,8 @@
  *     "label" = "label"
  *   },
  *   links = {
- *     "delete-form" = "contact.category_delete",
- *     "edit-form" = "contact.category_edit"
+ *     "delete-form" = "entity.contact_category.delete_form",
+ *     "edit-form" = "entity.contact_category.edit_form"
  *   }
  * )
  */
diff --git a/core/modules/contact/src/Entity/Message.php b/core/modules/contact/src/Entity/Message.php
index 2f5e1409a3f3..b52b32acbd21 100644
--- a/core/modules/contact/src/Entity/Message.php
+++ b/core/modules/contact/src/Entity/Message.php
@@ -32,7 +32,7 @@
  *   bundle_entity_type = "contact_category",
  *   fieldable = TRUE,
  *   links = {
- *     "admin-form" = "contact.category_edit"
+ *     "admin-form" = "entity.contact_category.edit_form"
  *   }
  * )
  */
-- 
GitLab