Ticket #60672: 60672.patch

src/js/_enqueues/lib/nav-menu.js

@@ -455 +455 @@
                                 depth = menuItem.menuItemDepth(),
                                 isPrimaryMenuItem = ( 0 === depth ),
                                 itemName = $this.closest( '.menu-item-handle' ).find( '.menu-item-title' ).text(),
+                                menuItemType = $this.closest( '.menu-item-handle' ).find( '.item-controls' ).find( '.item-type' ).text(),
                                 position = parseInt( menuItem.index(), 10 ),
                                 prevItemDepth = ( isPrimaryMenuItem ) ? depth : parseInt( depth - 1, 10 ),
                                 prevItemNameLeft = menuItem.prevAll('.menu-item-depth-' + prevItemDepth).first().find( '.menu-item-title' ).text(),
@@ -505 +506 @@
                                 totalMenuItems = primaryItems.length,
 
                                 // String together help text for primary menu items.
-                                title = menus.menuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$d', totalMenuItems );
+                                title = menus.menuFocus.replace( '%1$s', itemName ).replace( '%2$s', menuItemType );
                         } else {
                                 parentItem = menuItem.prevAll( '.menu-item-depth-' + parseInt( depth - 1, 10 ) ).first(),
                                 parentItemId = parentItem.find( '.menu-item-data-db-id' ).val(),
@@ -514 +515 @@
                                 itemPosition = $( subItems.parents('.menu-item').get().reverse() ).index( menuItem ) + 1;
 
                                 // String together help text for sub menu items.
-                                title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$s', parentItemName );
+                                title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$s', menuItemType );
                         }
 
                         $this.attr( 'aria-label', title );

src/wp-admin/includes/class-walker-nav-menu-edit.php

@@ -182 +182 @@
                                                         '<a class="item-edit" id="edit-%s" href="%s" aria-label="%s"><span class="screen-reader-text">%s</span></a>',
                                                         $item_id,
                                                         esc_url( $edit_url ),
-                                                        esc_attr__( 'Edit menu item' ),
+                                                        esc_attr__( 'Edit menu item: '.esc_html( $title ).' ('.esc_html( $menu_item->type_label ).')' ),
                                                         /* translators: Hidden accessibility text. */
-                                                        __( 'Edit' )
+                                                        __( 'Edit menu item: '.esc_html( $title ).' ('.esc_html( $menu_item->type_label ).')' )
                                                 );
                                                 ?>
                                         </span>

src/wp-admin/nav-menus.php

@@ -581 +581 @@
         /* translators: %s: Previous item name. */
         'outFrom'                 => __( 'Out from under %s' ),
         /* translators: 1: Item name, 2: Item position, 3: Total number of items. */
-        'menuFocus'               => __( '%1$s. Menu item %2$d of %3$d.' ),
+        'menuFocus'               => __( 'Edit menu item: %1$s (%2$s)' ),
         /* translators: 1: Item name, 2: Item position, 3: Parent item name. */
-        'subMenuFocus'            => __( '%1$s. Sub item number %2$d under %3$s.' ),
+        'subMenuFocus'            => __( 'Edit menu item: %1$s (%2$s)' ),
         /* translators: %s: Item name. */
         'menuItemDeletion'        => __( 'item %s' ),
         /* translators: %s: Item name. */