From f2a69e631c968fbb91b40aea8bb2feca1e785889 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 5 Apr 2015 14:58:27 +0000 Subject: [PATCH] After [31941], use the decoupled strings from `wp-admin/network/themes.php` in `wp-admin/network/site-themes.php` as well. fixes #28502. Built from https://develop.svn.wordpress.org/trunk@32029 git-svn-id: http://core.svn.wordpress.org/trunk@32008 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network/site-themes.php | 18 ++++++++++++++---- wp-includes/version.php | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 3150d05050..48f1d93ef9 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -156,11 +156,21 @@ foreach ( $tabs as $tab_id => $tab ) {

' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '

'; + $enabled = absint( $_GET['enabled'] ); + if ( 1 == $enabled ) { + $message = __( 'Theme enabled.' ); + } else { + $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled ); + } + echo '

' . sprintf( $message, number_format_i18n( $enabled ) ) . '

'; } elseif ( isset( $_GET['disabled'] ) ) { - $_GET['disabled'] = absint( $_GET['disabled'] ); - echo '

' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '

'; + $disabled = absint( $_GET['disabled'] ); + if ( 1 == $disabled ) { + $message = __( 'Theme disabled.' ); + } else { + $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled ); + } + echo '

' . sprintf( $message, number_format_i18n( $disabled ) ) . '

'; } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) { echo '

' . __( 'No theme selected.' ) . '

'; } ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index 54d06ca61a..6502022d49 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-beta4-32028'; +$wp_version = '4.2-beta4-32029'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.