WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After [31941], use the decoupled strings from `WP_Customize_Manager::register_controls()` on the Menus screen. 

see #28502.
Built from https://develop.svn.wordpress.org/trunk@31951


git-svn-id: http://core.svn.wordpress.org/trunk@31930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-04-01 11:37:26 +00:00
parent b95a8227d8
commit 6a297b848a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/nav-menus.php
View File

@ -562,7 +562,11 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
?>
<?php
if ( $locations_screen ) :
echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu you would like to use.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
if ( 1 == $num_locations ) {
echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
} else {
echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
}
?>
<div id="menu-locations-wrap">
<form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta3-31950';
$wp_version = '4.2-beta3-31951';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.