Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-26 14:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Customize: Fix string translations for singular vs plural after [41812].

Browse Source 
Props felipeelia, tobifjellner, SergeyBiryukov.
See #42112.
Fixes #42170.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2017-10-10 21:04:49 +00:00
parent 5123283cf7
commit c1ede53374
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-customize-nav-menus.php
View File

@ -414,7 +414,7 @@ final class WP_Customize_Nav_Menus {
'page_label' => get_post_type_object( 'page' )->labels->singular_name, 'page_label' => get_post_type_object( 'page' )->labels->singular_name,
/* translators: %s: menu location */ /* translators: %s: menu location */
'menuLocation' => _x( '(Currently set to: %s)', 'menu' ), 'menuLocation' => _x( '(Currently set to: %s)', 'menu' ),
'locationsTitle' => _n( 'Menu Location', 'Menu Locations', $num_locations ), 'locationsTitle' => 1 === $num_locations ? __( 'Menu Location' ) : __( 'Menu Locations' ),
'locationsDescription' => $locations_description, 'locationsDescription' => $locations_description,
'menuNameLabel' => __( 'Menu Name' ), 'menuNameLabel' => __( 'Menu Name' ),
'newMenuNameDescription' => __( 'If your theme has multiple menus, giving them clear names will help you manage them.' ), 'newMenuNameDescription' => __( 'If your theme has multiple menus, giving them clear names will help you manage them.' ),
@ -584,10 +584,10 @@ final class WP_Customize_Nav_Menus {
} }
$this->manager->add_section( 'menu_locations', array( $this->manager->add_section( 'menu_locations', array(
'title' => _nx( 'View Location', 'View All Locations', $num_locations, 'menu locations' ), 'title' => 1 === $num_locations ? _x( 'View Location', 'menu locations' ) : _x( 'View All Locations', 'menu locations' ),
'panel' => 'nav_menus', 'panel' => 'nav_menus',
'priority' => 30, 'priority' => 30,
'description' => $description 'description' => $description,
) ); ) );
$choices = array( '0' => __( '— Select —' ) ); $choices = array( '0' => __( '— Select —' ) );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-beta1-41815'; $wp_version = '4.9-beta1-41816';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.