From b36fa8ce9c5036532c0e471a230dc8a5cd4bd354 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 10 Oct 2017 17:57:48 +0000
Subject: [PATCH] Customize: Adjust "Menu Locations" labels for
 singular/plural.

Props felipeelia.
Fixes #42112.

Built from https://develop.svn.wordpress.org/trunk@41812


git-svn-id: http://core.svn.wordpress.org/trunk@41646 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-nav-menus.php | 5 +++--
 wp-includes/version.php                      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-includes/class-wp-customize-nav-menus.php b/wp-includes/class-wp-customize-nav-menus.php
index 3243c12c59..6c2a98b835 100644
--- a/wp-includes/class-wp-customize-nav-menus.php
+++ b/wp-includes/class-wp-customize-nav-menus.php
@@ -414,6 +414,7 @@ final class WP_Customize_Nav_Menus {
 				'page_label'             => get_post_type_object( 'page' )->labels->singular_name,
 				/* translators: %s:      menu location */
 				'menuLocation'           => _x( '(Currently set to: %s)', 'menu' ),
+				'locationsTitle'         => _n( 'Menu Location', 'Menu Locations', $num_locations ),
 				'locationsDescription'   => $locations_description,
 				'menuNameLabel'          => __( 'Menu Name' ),
 				'newMenuNameDescription' => __( 'If your theme has multiple menus, giving them clear names will help you manage them.' ),
@@ -583,7 +584,7 @@ final class WP_Customize_Nav_Menus {
 		}
 
 		$this->manager->add_section( 'menu_locations', array(
-			'title'       => _x( 'View All Locations', 'menu locations' ),
+			'title'       => _nx( 'View Location', 'View All Locations', $num_locations, 'menu locations' ),
 			'panel'       => 'nav_menus',
 			'priority'    => 30,
 			'description' => $description
@@ -945,7 +946,7 @@ final class WP_Customize_Nav_Menus {
 		</script>
 
 		<script type="text/html" id="tmpl-nav-menu-locations-header">
-			<span class="customize-control-title customize-section-title-menu_locations-heading"><?php _e( 'Menu Locations' ); ?></span>
+			<span class="customize-control-title customize-section-title-menu_locations-heading">{{ data.l10n.locationsTitle }}</span>
 			<p class="customize-control-description customize-section-title-menu_locations-description">{{ data.l10n.locationsDescription }}</p>
 		</script>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 18fecc2f20..e90e8290a7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-beta1-41811';
+$wp_version = '4.9-beta1-41812';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.