Changeset 36573

Timestamp:

02/18/2016 05:15:28 PM (8 years ago)

Author:

ocean90

Message:

Customizer: In nav menus show the location name instead of slug.

Props ryankienstra.
Fixes #34755.

Location:

trunk/src

Files:

• wp-admin/js/customize-nav-menus.js (modified) (3 diffs)
• wp-includes/class-wp-customize-nav-menus.php (modified) (2 diffs)

trunk/src/wp-admin/js/customize-nav-menus.js

@@ -25 +25 @@
             nav_menu: {},
             nav_menu_item: {}
-        }
+        },
+        locationSlugMappedToName: {}
     };
     if ( 'undefined' !== typeof _wpCustomizeNavMenusSettings ) {
@@ -806 +807 @@
          * @param {array} themeLocations
          */
-        updateAssignedLocationsInSectionTitle: function( themeLocations ) {
+        updateAssignedLocationsInSectionTitle: function( themeLocationSlugs ) {
             var section = this,
                 $title;
@@ -812 +813 @@
             $title = section.container.find( '.accordion-section-title:first' );
             $title.find( '.menu-in-location' ).remove();
-            _.each( themeLocations, function( themeLocation ) {
-                var $label = $( '<span class="menu-in-location"></span>' );
-                $label.text( api.Menus.data.l10n.menuLocation.replace( '%s', themeLocation ) );
+            _.each( themeLocationSlugs, function( themeLocationSlug ) {
+                var $label, locationName;
+                $label = $( '<span class="menu-in-location"></span>' );
+                locationName = api.Menus.data.locationSlugMappedToName[ themeLocationSlug ];
+                $label.text( api.Menus.data.l10n.menuLocation.replace( '%s', locationName ) );
                 $title.append( $label );
             });
 
-            section.container.toggleClass( 'assigned-to-menu-location', 0 !== themeLocations.length );
+            section.container.toggleClass( 'assigned-to-menu-location', 0 !== themeLocationSlugs.length );
 
         },

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -351 +351 @@
                 'unnamed'           => _x( '(unnamed)', 'Missing menu name.' ),
                 'custom_label'      => __( 'Custom Link' ),
-                /* translators: %s: menu location slug */
+                /* translators: %s: menu location */
                 'menuLocation'      => _x( '(Currently set to: %s)', 'menu' ),
                 'menuNameLabel'     => __( 'Menu Name' ),
@@ -382 +382 @@
                 'nav_menu_item' => $temp_nav_menu_item_setting->default,
             ),
+            'locationSlugMappedToName' => get_registered_nav_menus(),
         );