diff --git a/core/modules/menu_link_content/menu_link_content.routing.yml b/core/modules/menu_link_content/menu_link_content.routing.yml index 8c00ee0..38853f1 100644 --- a/core/modules/menu_link_content/menu_link_content.routing.yml +++ b/core/modules/menu_link_content/menu_link_content.routing.yml @@ -7,7 +7,7 @@ entity.menu.add_link_form: _entity_create_access: 'menu_link_content' entity.menu_link_content.canonical: - path: '/admin/structure/menu/item/{menu_link_content}/edit' + path: '/admin/structure/menu/link/{menu_link_content}/edit' defaults: _entity_form: 'menu_link_content.default' _title: 'Edit menu link' @@ -15,7 +15,7 @@ entity.menu_link_content.canonical: _entity_access: 'menu_link_content.update' entity.menu_link_content.edit_form: - path: '/admin/structure/menu/item/{menu_link_content}/edit' + path: '/admin/structure/menu/link/{menu_link_content}/edit' defaults: _entity_form: 'menu_link_content.default' _title: 'Edit menu link' @@ -23,7 +23,7 @@ entity.menu_link_content.edit_form: _entity_access: 'menu_link_content.update' entity.menu_link_content.delete_form: - path: '/admin/structure/menu/item/{menu_link_content}/delete' + path: '/admin/structure/menu/link/{menu_link_content}/delete' defaults: _entity_form: 'menu_link_content.delete' _title: 'Delete menu link' diff --git a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php index abbc694..94ea3bc 100644 --- a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php +++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php @@ -45,9 +45,9 @@ * "bundle" = "bundle" * }, * links = { - * "canonical" = "/admin/structure/menu/item/{menu_link_content}/edit", - * "edit-form" = "/admin/structure/menu/item/{menu_link_content}/edit", - * "delete-form" = "/admin/structure/menu/item/{menu_link_content}/delete", + * "canonical" = "/admin/structure/menu/link/{menu_link_content}/edit", + * "edit-form" = "/admin/structure/menu/link/{menu_link_content}/edit", + * "delete-form" = "/admin/structure/menu/link/{menu_link_content}/delete", * } * ) */ diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php index ab4c62a..611d881 100644 --- a/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php +++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php @@ -88,9 +88,9 @@ function testTranslationLinkTheme() { $edit = array(); $edit['admin_theme'] = 'seven'; $this->drupalPostForm('admin/appearance', $edit, t('Save configuration')); - $this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit'); + $this->drupalGet('admin/structure/menu/link/' . $entityId . '/edit'); $this->assertRaw('core/themes/seven/css/base/elements.css', 'Edit uses admin theme.'); - $this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit/translations'); + $this->drupalGet('admin/structure/menu/link/' . $entityId . '/edit/translations'); $this->assertRaw('core/themes/seven/css/base/elements.css', 'Translation uses admin theme as well.'); } diff --git a/core/modules/menu_ui/menu_ui.admin.js b/core/modules/menu_ui/menu_ui.admin.js index 8c037c5..b699265 100644 --- a/core/modules/menu_ui/menu_ui.admin.js +++ b/core/modules/menu_ui/menu_ui.admin.js @@ -6,18 +6,18 @@ attach: function (context, settings) { var $menu = $('#edit-menu').once('menu-parent'); if ($menu.length) { - // Update the list of available parent menu items to match the initial + // Update the list of available parent menu links to match the initial // available menus. Drupal.menuUiUpdateParentList(); - // Update list of available parent menu items. + // Update list of available parent menu links. $menu.on('change', 'input', Drupal.menuUiUpdateParentList); } } }; /** - * Function to set the options of the menu parent item dropdown. + * Function to set the options of the menu parent link dropdown. */ Drupal.menuUiUpdateParentList = function () { var $menu = $('#edit-menu'); diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module index 4700926..71b0a84 100644 --- a/core/modules/menu_ui/menu_ui.module +++ b/core/modules/menu_ui/menu_ui.module @@ -39,7 +39,7 @@ function menu_ui_help($route_name, RouteMatchInterface $route_match) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Managing menus') . '
'; - $output .= '
' . t('Users with the Administer menus and menu items permission can add, edit, and delete custom menus on the Menus page. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block (if you have the Block module installed). By selecting Edit menu, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', array('!block_help' => \Drupal::url('help.page', array('name' => 'block')), '!menu' => \Drupal::url('entity.menu.collection'))) . '
'; + $output .= '
' . t('Users with the Administer menus and menu links permission can add, edit, and delete custom menus on the Menus page. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block (if you have the Block module installed). By selecting Edit menu, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', array('!block_help' => \Drupal::url('help.page', array('name' => 'block')), '!menu' => \Drupal::url('entity.menu.collection'))) . '
'; $output .= '
' . t('Displaying menus') . '
'; $output .= '
' . t('If you have the Block module enabled, then each menu that you create is rendered in a block that you enable and position on the Block layout page. In some themes, the main menu and possibly the secondary menu will be output automatically; you may be able to disable this behavior on the theme\'s settings page.', array('!blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', '!themes' => \Drupal::url('system.themes_page'), '!theme_settings' => \Drupal::url('system.theme_settings'))) . '
'; $output .= '
'; @@ -244,7 +244,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) { /** * Implements hook_form_BASE_FORM_ID_alter() for node_form. * - * Adds menu item fields to the node form. + * Adds menu link fields to the node form. * * @see menu_ui_form_node_form_submit() */ @@ -270,7 +270,7 @@ function menu_ui_form_node_form_alter(&$form, FormStateInterface $form_state) { $default = $node_type->getThirdPartySetting('menu_ui', 'parent', 'main:'); } $parent_element = $menu_parent_selector->parentSelectElement($default, $defaults['id'], $available_menus); - // If no possible parent menu items were found, there is nothing to display. + // If no possible parent menu links were found, there is nothing to display. if (empty($parent_element)) { return; } @@ -323,7 +323,7 @@ function menu_ui_form_node_form_alter(&$form, FormStateInterface $form_state) { ); $form['menu']['link']['menu_parent'] = $parent_element; - $form['menu']['link']['menu_parent']['#title'] = t('Parent item'); + $form['menu']['link']['menu_parent']['#title'] = t('Parent link'); $form['menu']['link']['menu_parent']['#attributes']['class'][] = 'menu-parent-select'; $form['menu']['link']['weight'] = array( @@ -341,7 +341,7 @@ function menu_ui_form_node_form_alter(&$form, FormStateInterface $form_state) { } /** - * Form submission handler for menu item field on the node form. + * Form submission handler for menu link field on the node form. * * @see menu_ui_form_node_form_alter() */ @@ -405,10 +405,10 @@ function menu_ui_form_node_type_form_alter(&$form, FormStateInterface $form_stat $options = $menu_parent_selector->getParentSelectOptions(''); $form['menu']['menu_parent'] = array( '#type' => 'select', - '#title' => t('Default parent item'), + '#title' => t('Default parent link'), '#default_value' => $type->getThirdPartySetting('menu_ui', 'parent', 'main:'), '#options' => $options, - '#description' => t('Choose the menu item to be the default parent for a new link in the content authoring form.'), + '#description' => t('Choose the menu link to be the default parent for a new link in the content authoring form.'), '#attributes' => array('class' => array('menu-title-select')), ); @@ -423,12 +423,12 @@ function menu_ui_form_node_type_form_alter(&$form, FormStateInterface $form_stat */ function menu_ui_form_node_type_form_validate(&$form, FormStateInterface $form_state) { $available_menus = array_filter($form_state->getValue('menu_options')); - // If there is at least one menu allowed, the selected item should be in + // If there is at least one menu allowed, the selected link should be in // one of them. if (count($available_menus)) { - $menu_item_id_parts = explode(':', $form_state->getValue('menu_parent')); - if (!in_array($menu_item_id_parts[0], $available_menus)) { - $form_state->setErrorByName('menu_parent', t('The selected menu item is not under one of the selected menus.')); + $menu_link_id_parts = explode(':', $form_state->getValue('menu_parent')); + if (!in_array($menu_link_id_parts[0], $available_menus)) { + $form_state->setErrorByName('menu_parent', t('The selected menu link is not under one of the selected menus.')); } } else { diff --git a/core/modules/menu_ui/menu_ui.permissions.yml b/core/modules/menu_ui/menu_ui.permissions.yml index 9bc104f..5653aac 100644 --- a/core/modules/menu_ui/menu_ui.permissions.yml +++ b/core/modules/menu_ui/menu_ui.permissions.yml @@ -1,2 +1,2 @@ administer menu: - title: 'Administer menus and menu items' + title: 'Administer menus and menu links' diff --git a/core/modules/menu_ui/src/Controller/MenuController.php b/core/modules/menu_ui/src/Controller/MenuController.php index 95788bd..17c68a2 100644 --- a/core/modules/menu_ui/src/Controller/MenuController.php +++ b/core/modules/menu_ui/src/Controller/MenuController.php @@ -45,13 +45,13 @@ public static function create(ContainerInterface $container) { } /** - * Gets all the available menus and menu items as a JavaScript array. + * Gets all the available menus and menu links as a JavaScript array. * * @param \Symfony\Component\HttpFoundation\Request $request * The request of the page. * * @return \Symfony\Component\HttpFoundation\JsonResponse - * The available menu and menu items. + * The available menu and menu links. */ public function getParentOptions(Request $request) { $available_menus = array(); diff --git a/core/modules/menu_ui/src/Form/MenuDeleteForm.php b/core/modules/menu_ui/src/Form/MenuDeleteForm.php index 0b37e59..7979976 100644 --- a/core/modules/menu_ui/src/Form/MenuDeleteForm.php +++ b/core/modules/menu_ui/src/Form/MenuDeleteForm.php @@ -62,7 +62,7 @@ public function getDescription() { $caption = ''; $num_links = $this->menuLinkManager->countMenuLinks($this->entity->id()); if ($num_links) { - $caption .= '

' . $this->formatPlural($num_links, 'Warning: There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', 'Warning: There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $this->entity->label())) . '

'; + $caption .= '

' . $this->formatPlural($num_links, 'Warning: There is currently 1 menu link in %title. It will be deleted (system-defined links will be reset).', 'Warning: There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $this->entity->label())) . '

'; } $caption .= '

' . t('This action cannot be undone.') . '

'; return $caption; diff --git a/core/modules/menu_ui/src/Tests/MenuLanguageTest.php b/core/modules/menu_ui/src/Tests/MenuLanguageTest.php index fe5e65a..3d8a125 100644 --- a/core/modules/menu_ui/src/Tests/MenuLanguageTest.php +++ b/core/modules/menu_ui/src/Tests/MenuLanguageTest.php @@ -42,7 +42,7 @@ protected function setUp() { } /** - * Tests menu language settings and the defaults for menu link items. + * Tests menu language settings and the defaults for menu links. */ function testMenuLanguage() { // Create a test menu to test the various language-related settings. @@ -109,21 +109,21 @@ function testMenuLanguage() { $edit = array( 'langcode[0][value]' => 'bb', ); - $this->drupalPostForm('admin/structure/menu/item/' . $menu_link->id() . '/edit', $edit, t('Save')); + $this->drupalPostForm('admin/structure/menu/link/' . $menu_link->id() . '/edit', $edit, t('Save')); $this->assertMenuLink($menu_link->getPluginId(), array( 'menu_name' => $menu_name, 'route_name' => '', 'langcode' => 'bb', )); - // Saving menu link items ends up on the edit menu page. To check the menu + // Saving menu links ends up on the edit menu page. To check the menu // link has the correct language default on edit, go to the menu link edit // page first. - $this->drupalGet('admin/structure/menu/item/' . $menu_link->id() . '/edit'); + $this->drupalGet('admin/structure/menu/link/' . $menu_link->id() . '/edit'); // Check that the language selector has the correct default value. $this->assertOptionSelected('edit-langcode-0-value', 'bb', 'The menu link language was correctly selected.'); - // Edit menu to hide the language select on menu link item add. + // Edit menu to hide the language select on menu link add. ContentLanguageSettings::loadByEntityTypeBundle('menu_link_content', 'menu_link_content') ->setDefaultLangcode('cc') ->setLanguageAlterable(FALSE) diff --git a/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/core/modules/menu_ui/src/Tests/MenuNodeTest.php index 6b1a9a4..f54e23c 100644 --- a/core/modules/menu_ui/src/Tests/MenuNodeTest.php +++ b/core/modules/menu_ui/src/Tests/MenuNodeTest.php @@ -72,14 +72,14 @@ function testMenuNodeFormWidget() { $node = $this->drupalGetNodeByTitle($node_title); $this->assertEqual($node->getTitle(), $edit['title[0][value]']); - // Test that we cannot set a menu item from a menu that is not set as + // Test that we cannot set a menu link from a menu that is not set as // available. $edit = array( 'menu_options[tools]' => 1, 'menu_parent' => 'main:', ); $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type')); - $this->assertText(t('The selected menu item is not under one of the selected menus.')); + $this->assertText(t('The selected menu link is not under one of the selected menus.')); $this->assertNoRaw(t('The content type %name has been updated.', array('%name' => 'Basic page'))); // Enable Tools menu as available menu. @@ -91,7 +91,7 @@ function testMenuNodeFormWidget() { $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type')); $this->assertRaw(t('The content type %name has been updated.', array('%name' => 'Basic page'))); - // Test that we can preview a node that will create a menu item. + // Test that we can preview a node that will create a menu link. $edit = array( 'title[0][value]' => $node_title, 'menu[enabled]' => 1, diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php index 722548f..e5f6468 100644 --- a/core/modules/menu_ui/src/Tests/MenuTest.php +++ b/core/modules/menu_ui/src/Tests/MenuTest.php @@ -118,7 +118,7 @@ function testMenu() { $this->assertLinkByHref(Url::fromRoute('entity.menu_link_content.delete_form', ['menu_link_content' => $this->items[0]->id()])->toString()); $this->assertNoLinkByHref(Url::fromRoute('menu_ui.link_reset', ['menu_link_plugin' => $this->items[0]->getPluginId()])->toString()); // Check delete and reset access. - $this->drupalGet('admin/structure/menu/item/' . $this->items[0]->id() . '/delete'); + $this->drupalGet('admin/structure/menu/link/' . $this->items[0]->id() . '/delete'); $this->assertResponse(200); $this->drupalGet('admin/structure/menu/link/' . $this->items[0]->getPluginId() . '/reset'); $this->assertResponse(403); @@ -453,7 +453,7 @@ function doMenuTests() { $item7 = $this->addMenuLink('', 'http://drupal.org', $menu_name); $this->assertMenuLink($item7->getPluginId(), array('url' => 'http://drupal.org')); - // Add menu item. + // Add menu link. $item8 = $this->addMenuLink('', '/', $menu_name); $this->assertMenuLink($item8->getPluginId(), array('route_name' => '')); $this->drupalGet(''); @@ -497,25 +497,25 @@ function testMenuQueryAndFragment() { $path = '/test-page?arg1=value1&arg2=value2'; $item = $this->addMenuLink('', $path); - $this->drupalGet('admin/structure/menu/item/' . $item->id() . '/edit'); + $this->drupalGet('admin/structure/menu/link/' . $item->id() . '/edit'); $this->assertFieldByName('link[0][uri]', $path, 'Path is found with both query and fragment.'); // Now change the path to something without query and fragment. $path = '/test-page'; - $this->drupalPostForm('admin/structure/menu/item/' . $item->id() . '/edit', array('link[0][uri]' => $path), t('Save')); - $this->drupalGet('admin/structure/menu/item/' . $item->id() . '/edit'); + $this->drupalPostForm('admin/structure/menu/link/' . $item->id() . '/edit', array('link[0][uri]' => $path), t('Save')); + $this->drupalGet('admin/structure/menu/link/' . $item->id() . '/edit'); $this->assertFieldByName('link[0][uri]', $path, 'Path no longer has query or fragment.'); // Use #fragment and ensure that saving it does not lose its content. $path = '?arg1=value#fragment'; $item = $this->addMenuLink('', $path); - $this->drupalGet('admin/structure/menu/item/' . $item->id() . '/edit'); + $this->drupalGet('admin/structure/menu/link/' . $item->id() . '/edit'); $this->assertFieldByName('link[0][uri]', $path, 'Path is found with both query and fragment.'); - $this->drupalPostForm('admin/structure/menu/item/' . $item->id() . '/edit', array(), t('Save')); + $this->drupalPostForm('admin/structure/menu/link/' . $item->id() . '/edit', array(), t('Save')); - $this->drupalGet('admin/structure/menu/item/' . $item->id() . '/edit'); + $this->drupalGet('admin/structure/menu/link/' . $item->id() . '/edit'); $this->assertFieldByName('link[0][uri]', $path, 'Path is found with both query and fragment.'); } @@ -536,7 +536,7 @@ function testSystemMenuRename() { } /** - * Tests that menu items pointing to unpublished nodes are editable. + * Tests that menu links pointing to unpublished nodes are editable. */ function testUnpublishedNodeMenuItem() { $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content', 'bypass node access'))); @@ -550,7 +550,7 @@ function testUnpublishedNodeMenuItem() { $this->modifyMenuLink($item); // Test that a user with 'administer menu' but without 'bypass node access' - // cannot see the menu item. + // cannot see the menu link. $this->drupalLogout(); $this->drupalLogin($this->adminUser); $this->drupalGet('admin/structure/menu/manage/' . $item->getMenuName()); @@ -740,7 +740,7 @@ function moveMenuLink(MenuLinkContent $item, $parent, $menu_name) { $edit = array( 'menu_parent' => $menu_name . ':' . $parent, ); - $this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save')); + $this->drupalPostForm("admin/structure/menu/link/$mlid/edit", $edit, t('Save')); $this->assertResponse(200); } @@ -759,7 +759,7 @@ function modifyMenuLink(MenuLinkContent $item) { // Edit menu link. $edit = array(); $edit['title[0][value]'] = $title; - $this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save')); + $this->drupalPostForm("admin/structure/menu/link/$mlid/edit", $edit, t('Save')); $this->assertResponse(200); $this->assertText('The menu link has been saved.'); // Verify menu link. @@ -797,7 +797,7 @@ function deleteMenuLink(MenuLinkContent $item) { $title = $item->getTitle(); // Delete menu link. - $this->drupalPostForm("admin/structure/menu/item/$mlid/delete", array(), t('Delete')); + $this->drupalPostForm("admin/structure/menu/link/$mlid/delete", array(), t('Delete')); $this->assertResponse(200); $this->assertRaw(t('The menu link %title has been deleted.', array('%title' => $title)), 'Menu link was deleted'); @@ -834,7 +834,7 @@ function toggleMenuLink(MenuLinkContent $item) { function disableMenuLink(MenuLinkContent $item) { $mlid = $item->id(); $edit['enabled[value]'] = FALSE; - $this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save')); + $this->drupalPostForm("admin/structure/menu/link/$mlid/edit", $edit, t('Save')); // Unlike most other modules, there is no confirmation message displayed. // Verify in the database. @@ -850,7 +850,7 @@ function disableMenuLink(MenuLinkContent $item) { function enableMenuLink(MenuLinkContent $item) { $mlid = $item->id(); $edit['enabled[value]'] = TRUE; - $this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save')); + $this->drupalPostForm("admin/structure/menu/link/$mlid/edit", $edit, t('Save')); // Verify in the database. $this->assertMenuLink($item->getPluginId(), array('enabled' => 1)); @@ -925,7 +925,7 @@ private function verifyAccess($response = 200) { $this->drupalGet('admin/structure/menu/link/' . $item->getPluginId() . '/edit'); $this->assertResponse($response); if ($response == 200) { - $this->assertText(t('Edit menu item'), 'Menu edit page was displayed'); + $this->assertText(t('Edit menu link'), 'Menu edit page was displayed'); } // View add menu page. diff --git a/core/modules/menu_ui/src/Tests/MenuWebTestBase.php b/core/modules/menu_ui/src/Tests/MenuWebTestBase.php index 7599023..4175fec 100644 --- a/core/modules/menu_ui/src/Tests/MenuWebTestBase.php +++ b/core/modules/menu_ui/src/Tests/MenuWebTestBase.php @@ -22,10 +22,10 @@ public static $modules = array('menu_ui', 'menu_link_content'); /** - * Fetches the menu item from the database and compares it to expected item. + * Fetches the menu link from the database and compares it to expected link. * * @param int $menu_plugin_id - * Menu item id. + * Menu link id. * @param array $expected_item * Array containing properties to verify. */ diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php index 751b2fe..0b61dd4 100644 --- a/core/modules/views/src/Plugin/views/display/Page.php +++ b/core/modules/views/src/Plugin/views/display/Page.php @@ -169,7 +169,7 @@ public function optionsSummary(&$categories, &$options) { // This adds a 'Settings' link to the style_options setting if the style // has options. if ($menu['type'] == 'default tab') { - $options['menu']['setting'] = $this->t('Parent menu item'); + $options['menu']['setting'] = $this->t('Parent menu link'); $options['menu']['links']['tab_options'] = $this->t('Change settings for the parent menu'); } } @@ -182,7 +182,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { switch ($form_state->get('section')) { case 'menu': - $form['#title'] .= $this->t('Menu item entry'); + $form['#title'] .= $this->t('Menu link entry'); $form['menu'] = array( '#prefix' => '
', '#suffix' => '
', @@ -315,7 +315,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { } $form['tab_markup'] = array( - '#markup' => '
' . $this->t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is foo/bar/baz, the parent path would be foo/bar.') . '
', + '#markup' => '
' . $this->t('When providing a menu link as a tab, Drupal needs to know what the parent menu link of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent link will always be the same path with the last part left off. i.e, if the path to this view is foo/bar/baz, the parent path would be foo/bar.') . '
', ); $form['tab_options'] = array( @@ -326,9 +326,9 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['tab_options']['type'] = array( '#prefix' => '
', '#suffix' => '
', - '#title' => $this->t('Parent menu item'), + '#title' => $this->t('Parent menu link'), '#type' => 'radios', - '#options' => array('none' => $this->t('Already exists'), 'normal' => $this->t('Normal menu item'), 'tab' => $this->t('Menu tab')), + '#options' => array('none' => $this->t('Already exists'), 'normal' => $this->t('Normal menu link'), 'tab' => $this->t('Menu tab')), '#default_value' => $tab_options['type'], ); $form['tab_options']['title'] = array( @@ -336,7 +336,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Title'), '#type' => 'textfield', '#default_value' => $tab_options['title'], - '#description' => $this->t('If creating a parent menu item, enter the title of the item.'), + '#description' => $this->t('If creating a parent menu link, enter the title of the link.'), '#states' => array( 'visible' => array( array( @@ -352,7 +352,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Description'), '#type' => 'textfield', '#default_value' => $tab_options['description'], - '#description' => $this->t('If creating a parent menu item, enter the description of the item.'), + '#description' => $this->t('If creating a parent menu link, enter the description of the link.'), '#states' => array( 'visible' => array( array( @@ -370,7 +370,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#type' => 'textfield', '#default_value' => $tab_options['weight'], '#size' => 5, - '#description' => $this->t('If the parent menu item is a tab, enter the weight of the tab. Heavier tabs will sink and the lighter tabs will be positioned nearer to the first menu item.'), + '#description' => $this->t('If the parent menu link is a tab, enter the weight of the tab. Heavier tabs will sink and the lighter tabs will be positioned nearer to the first menu link.'), '#states' => array( 'visible' => array( ':input[name="tab_options[type]"]' => array('value' => 'tab'), @@ -391,7 +391,7 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) { $path = $this->getOption('path'); $menu_type = $form_state->getValue(array('menu', 'type')); if ($menu_type == 'normal' && strpos($path, '%') !== FALSE) { - $form_state->setError($form['menu']['type'], $this->t('Views cannot create normal menu items for paths with a % in them.')); + $form_state->setError($form['menu']['type'], $this->t('Views cannot create normal menu links for paths with a % in them.')); } if ($menu_type == 'default tab' || $menu_type == 'tab') {