Changeset 35670

Timestamp:

11/18/2015 06:03:47 PM (11 years ago)

Author:

SergeyBiryukov

Message:

I18N: After [34424], replace the placeholder with comments count after translate_nooped_plural() runs, not before.

Props hnle.
Fixes #34680.

File:

• trunk/src/wp-admin/includes/class-wp-comments-list-table.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -205 +205 @@
                 //, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
                 $stati = array(
-                        'all' => str_replace( '%s', '<span class="all-count">%s</span>',
-                                /* translators: %s: all comments count */
-                                _nx_noop(
-                                        'All <span class="count">(%s)</span>',
-                                        'All <span class="count">(%s)</span>',
-                                        'comments'
-                                )
+                        /* translators: %s: all comments count */
+                        'all' => _nx_noop(
+                                'All <span class="count">(%s)</span>',
+                                'All <span class="count">(%s)</span>',
+                                'comments'
                         ), // singular not used
-                        'moderated' => str_replace( '%s', '<span class="pending-count">%s</span>',
-                                /* translators: %s: pending comments count */
-                                _nx_noop(
-                                        'Pending <span class="count">(%s)</span>',
-                                        'Pending <span class="count">(%s)</span>',
-                                        'comments'
-                                )
+
+                        /* translators: %s: pending comments count */
+                        'moderated' => _nx_noop(
+                                'Pending <span class="count">(%s)</span>',
+                                'Pending <span class="count">(%s)</span>',
+                                'comments'
                         ),
-                        'approved' => str_replace( '%s', '<span class="approved-count">%s</span>',
-                                /* translators: %s: approved comments count */
-                                _nx_noop(
-                                        'Approved <span class="count">(%s)</span>',
-                                        'Approved <span class="count">(%s)</span>',
-                                        'comments'
-                                )
+
+                        /* translators: %s: approved comments count */
+                        'approved' => _nx_noop(
+                                'Approved <span class="count">(%s)</span>',
+                                'Approved <span class="count">(%s)</span>',
+                                'comments'
                         ),
-                        'spam' => str_replace( '%s', '<span class="spam-count">%s</span>',
-                                /* translators: %s: spam comments count */
-                                _nx_noop(
-                                        'Spam <span class="count">(%s)</span>',
-                                        'Spam <span class="count">(%s)</span>',
-                                        'comments'
-                                )
+
+                        /* translators: %s: spam comments count */
+                        'spam' => _nx_noop(
+                                'Spam <span class="count">(%s)</span>',
+                                'Spam <span class="count">(%s)</span>',
+                                'comments'
                         ),
-                        'trash' => str_replace( '%s', '<span class="trash-count">%s</span>',
-                                /* translators: %s: trashed comments count */
-                                _nx_noop(
-                                        'Trash <span class="count">(%s)</span>',
-                                        'Trash <span class="count">(%s)</span>',
-                                        'comments'
-                                )
+
+                        /* translators: %s: trashed comments count */
+                        'trash' => _nx_noop(
+                                'Trash <span class="count">(%s)</span>',
+                                'Trash <span class="count">(%s)</span>',
+                                'comments'
                         )
                 );
@@ -267 +261 @@
                                 $link = add_query_arg( 's', esc_attr( wp_unslash( $_REQUEST['s'] ) ), $link );
                         */
-                        $status_links[$status] = "<a href='$link'$class>" . sprintf(
+                        $status_links[ $status ] = "<a href='$link'$class>" . sprintf(
                                 translate_nooped_plural( $label, $num_comments->$status ),
-                                number_format_i18n( $num_comments->$status )
+                                sprintf( '<span class="%s-count">%s</span>',
+                                        $status,
+                                        number_format_i18n( $num_comments->$status )
+                                )
                         ) . '</a>';
                 }