Ticket #34755: a9e1d83.diff

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

@@ -24 +24 @@
                 defaultSettingValues: {
                         nav_menu: {},
                         nav_menu_item: {}
-                }
+                },
+                locationSlugMappedToName: {}
         };
         if ( 'undefined' !== typeof _wpCustomizeNavMenusSettings ) {
                 $.extend( api.Menus.data, _wpCustomizeNavMenusSettings );
@@ -805 +806 @@
                 /**
                  * @param {array} themeLocations
                  */
-                updateAssignedLocationsInSectionTitle: function( themeLocations ) {
+                updateAssignedLocationsInSectionTitle: function( themeLocationSlugs ) {
                         var section = this,
                                 $title;
 
                         $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 );
 
                 },
 

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

@@ -381 +381 @@
                                 'nav_menu'      => $temp_nav_menu_setting->default,
                                 'nav_menu_item' => $temp_nav_menu_item_setting->default,
                         ),
+                        'locationSlugMappedToName' => get_registered_nav_menus(),
                 );
 
                 $data = sprintf( 'var _wpCustomizeNavMenusSettings = %s;', wp_json_encode( $settings ) );

tests/qunit/fixtures/customize-menus.js

@@ -102 +102 @@
                 'taxonomyTermLabel': 'Taxonomy',
                 'unnamed': '(unnamed)',
                 'untitled': '(no label)'
+        },
+        'locationSlugMappedToName': {
+                'main-footer': 'Main Footer',
+                'main-header': 'Main Header'
         }
 };
 window._wpCustomizeSettings.panels.nav_menus = {