diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 99d19bb1e3..510f935dd7 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -185,36 +185,32 @@ function wp_dashboard_right_now() {
true ), 'objects' );
- $post_types = (array) apply_filters( 'rightnow_post_types', $post_types );
- foreach ( $post_types as $post_type => $post_type_obj ){
+ // Posts and Pages
+ foreach ( array( 'post', 'page' ) as $post_type ) {
$num_posts = wp_count_posts( $post_type );
if ( $num_posts && $num_posts->publish ) {
- printf(
- '- %2$s %3$s
',
- $post_type,
- number_format_i18n( $num_posts->publish ),
- $post_type_obj->label
- );
+ if ( 'post' == $post_type ) {
+ $text = _n( '%s Post', '%s Posts', $num_posts->publish );
+ } else {
+ $text = _n( '%s Page', '%s Pages', $num_posts->publish );
+ }
+ $text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
+ printf( '- %2$s
', $post_type, $text );
}
}
// Comments
$num_comm = wp_count_comments();
if ( $num_comm && $num_comm->total_comments ) {
- $text = _n( 'comment', 'comments', $num_comm->total_comments );
- printf(
- '',
- number_format_i18n( $num_comm->total_comments ),
- $text
- );
+ $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->total_comments ), number_format_i18n( $num_comm->total_comments ) );
+ ?>
+
+ moderated ) {
- $text = _n( 'in moderation', 'in moderation', $num_comm->total_comments );
- printf(
- '',
- number_format_i18n( $num_comm->moderated ),
- $text
- );
+ /* translators: Number of comments in moderation */
+ $text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) );
+ ?>
+
+ %s, %s %s',
- ( $i >= intval ( $args['display'] ) ? ' class="hidden"' : '' ),
- $relative,
- get_the_time(),
- get_edit_post_link(),
- _draft_or_post_title()
- );
+ $text = sprintf(
+ /* translators: 1: relative date, 2: time, 4: post title */
+ __( '%1$s, %2$s %4$s' ),
+ $relative,
+ get_the_time(),
+ get_edit_post_link(),
+ _draft_or_post_title()
+ );
+
+ $hidden = $i > $args['display'] ? ' class="hidden"' : '';
$i++;
}
@@ -966,21 +964,29 @@ function wp_dashboard_quota() {
-
- %2$sMB %4$s',
+ %3$s',
esc_url( admin_url( 'upload.php' ) ),
- number_format_i18n( $quota ),
__( 'Manage Uploads' ),
- __( 'Space Allowed' )
+ $text
); ?>
-
- %2$sMB (%3$s%%) %5$s',
- esc_url( admin_url( 'upload.php' ) ),
+ %3$s',
+ esc_url( admin_url( 'upload.php' ) ),
__( 'Manage Uploads' ),
- __( 'Space Used' )
+ $text
); ?>