Ticket #26066: 26066.2.patch

wp-admin/includes/dashboard.php

@@ -197 +197 @@
         // Comments
         $num_comm = wp_count_comments();
         if ( $num_comm && $num_comm->total_comments ) {
-                $text = _n( 'comment', 'comments', $num_comm->total_comments );
-                printf(
-                        '<li class="comment-count"><a href="edit-comments.php">%1$s %2$s</a></li>',
-                        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 ) );
+                ?>
+                <li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
+                <?php
                 if ( $num_comm->moderated ) {
-                        $text = _n( 'in moderation', 'in moderation', $num_comm->total_comments );
-                        printf(
-                                '<li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated">%1$s %2$s</a></li>',
-                                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 ) );
+                        ?>
+                        <li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated"><?php echo $text; ?></a></li>
+                        <?php
                 }
         }
         do_action( 'rightnow_list_end' );
@@ -545 +542 @@
                 $i = 0;
                 while ( $posts->have_posts() ) {
                         $posts->the_post();
-                        printf(
-                                '<li%s><span>%s, %s</span> <a href="%s">%s</a></li>',
-                                ( $i >= intval ( $args['display'] ) ? ' class="hidden"' : '' ),
+                        /* translators: 1: relative date, 2: time, 4: post title */
+                        $text = sprintf(
+                                _x( '<span>%1$s, %2$s</span> <a href="%3$s">%4$s</a>', 'dashboard post list item' ),
                                 dashboard_relative_date( get_the_time( 'U' ) ),
                                 get_the_time(),
                                 get_edit_post_link(),
                                 _draft_or_post_title()
                         );
+                        printf(
+                                '<li%1$s>%2$s</li>',
+                                ( $i >= intval ( $args['display'] ) ? ' class="hidden"' : '' ),
+                                $text
+                        );
                         $i++;
                 }
 
@@ -643 +645 @@
         if ( date( 'Y-m-d', $time ) == $tomorrow )
                 return __( 'Tomorrow' );
 
-        return date( 'M jS', $time);
+        return date_i18n( __( 'M jS' ), $time);
 
 }
 
@@ -898 +900 @@
         <div class="mu-storage">
         <ul>
                 <li class="storage-count">
-                        <?php printf(
-                                '<a href="%1$s" title="%3$s">%2$sMB %4$s</a>',
+                        <?php $text = sprintf(
+                                /* translators: number of megabytes */
+                                __( '%sMB Space Allowed' ),
+                                number_format_i18n( $quota )
+                        );
+                        printf(
+                                '<a href="%1$s" title="%2$s">%3$s</a>',
                                 esc_url( admin_url( 'upload.php' ) ),
-                                number_format_i18n( $quota ),
                                 __( 'Manage Uploads' ),
-                                __( 'Space Allowed' )
+                                $text
                         ); ?>
                 </li><li class="storage-count <?php echo $used_class; ?>">
-                        <?php printf(
-                                '<a href="%1$s" title="%4$s" class="musublink">%2$sMB (%3$s%%) %5$s</a>',
+                        <?php $text = sprintf(
+                                /* translators: 1: number of megabytes, 2: percentage */
+                                __( '%1$sMB (%2$s%%) Space Used' ),
+                                number_format_i18n( $used, 2 ),
+                                $percentused
+                        );
+                        printf(
+                                '<a href="%1$s" title="%2$s" class="musublink">%3$s</a>',
                                 esc_url( admin_url( 'upload.php' ) ),
-                                number_format_i18n( $used, 2 ),
-                                $percentused,
                                 __( 'Manage Uploads' ),
-                                __( 'Space Used' )
+                                $text
                         ); ?>
                 </li>
         </ul>