Commit a6b9405e authored by webchick's avatar webchick

Issue #2314875 by Crell: Standardize language entity route names.

parent 1bdb4965
......@@ -56,16 +56,16 @@ public function setUp() {
$this->routeProvider
->expects($this->any())
->method('getRouteByName')
->with('language.edit')
->with('entity.language_entity.edit_form')
->will($this->returnValue(new Route('/admin/config/regional/language/edit/{language_entity}')));
$definition = array(
'class' => '\Drupal\config_translation\ConfigEntityMapper',
'base_route_name' => 'language.edit',
'base_route_name' => 'entity.language_entity.edit_form',
'title' => '!label language',
'names' => array(),
'entity_type' => 'language_entity',
'route_name' => 'config_translation.item.overview.language.edit',
'route_name' => 'config_translation.item.overview.entity.language_entity.edit_form',
);
$typed_config_manager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface');
......
......@@ -7,7 +7,7 @@ language.negotiation:
route_name: language.negotiation
base_route: language.admin_overview
language.edit:
entity.language_entity.edit_form:
title: 'Edit'
route_name: language.edit
base_route: language.edit
route_name: entity.language_entity.edit_form
base_route: entity.language_entity.edit_form
......@@ -30,7 +30,7 @@ language.add:
requirements:
_entity_create_access: 'language_entity'
language.edit:
entity.language_entity.edit_form:
path: '/admin/config/regional/language/edit/{language_entity}'
defaults:
_entity_form: 'language_entity.edit'
......@@ -46,7 +46,7 @@ language.admin_overview:
requirements:
_permission: 'administer languages'
language.delete:
entity.language_entity.delete_form:
path: '/admin/config/regional/language/delete/{language_entity}'
defaults:
_entity_form: 'language_entity.delete'
......
......@@ -37,8 +37,8 @@
* "weight" = "weight"
* },
* links = {
* "delete-form" = "language.delete",
* "edit-form" = "language.edit"
* "delete-form" = "entity.language_entity.delete_form",
* "edit-form" = "entity.language_entity.edit_form"
* }
* )
*/
......
......@@ -46,8 +46,8 @@ public function getLanguageAdminOverviewRoutes() {
* Tests language edit local tasks existence.
*/
public function testLanguageEditLocalTasks() {
$this->assertLocalTasks('language.edit', array(
0 => array('language.edit'),
$this->assertLocalTasks('entity.language_entity.edit_form', array(
0 => array('entity.language_entity.edit_form'),
));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment