Changeset 46445 for trunk/src/wp-content/themes/twentytwenty/comments.php

Timestamp:

10/08/2019 07:05:53 PM (5 years ago)

Author:

desrosj

Message:

Bundled Themes: Update Twenty Twenty.

This brings trunk's version of Twenty Twenty in-sync with GitHub.

For a complete list of changes since [46357], see ​https://github.com/WordPress/twentytwenty/compare/7157870...7246fd6.

Props anlino, ianbelanger, poena, williampatton, nielslange, acosmin, netweb, joyusly, luminuu, itowhid06, cbravobernal, intimez, glauberglauber, ocean90, amolv, briceduclos, aristath, mukesh27, garrett-eclipse, audrasjb, afercia, dianeco, utsav72640, mahesh901122, tobifjellner.
See #48110.

File:

• trunk/src/wp-content/themes/twentytwenty/comments.php (modified) (4 diffs)

trunk/src/wp-content/themes/twentytwenty/comments.php

@@ -32 +32 @@
             <?php
             if ( ! have_comments() ) {
-                esc_html_e( 'Leave a comment', 'twentytwenty' );
+                _e( 'Leave a comment', 'twentytwenty' );
             } elseif ( '1' === $comments_number ) {
                 /* translators: %s: post title */
-                printf( esc_html_x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentytwenty' ), esc_html( get_the_title() ) );
+                printf( _x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentytwenty' ), esc_html( get_the_title() ) );
             } else {
-                echo esc_html(
-                    sprintf(
-                        /* translators: 1: number of comments, 2: post title */
-                        _nx(
-                            '%1$s reply on &ldquo;%2$s&rdquo;',
-                            '%1$s replies on &ldquo;%2$s&rdquo;',
-                            $comments_number,
-                            'comments title',
-                            'twentytwenty'
-                        ),
-                        number_format_i18n( $comments_number ),
-                        get_the_title()
-                    )
+                echo sprintf(
+                    /* translators: 1: number of comments, 2: post title */
+                    _nx(
+                        '%1$s reply on &ldquo;%2$s&rdquo;',
+                        '%1$s replies on &ldquo;%2$s&rdquo;',
+                        $comments_number,
+                        'comments title',
+                        'twentytwenty'
+                    ),
+                    number_format_i18n( $comments_number ),
+                    esc_html( get_the_title() )
                 );
             }
@@ -61 +59 @@
 
             <?php
-
             wp_list_comments(
                 array(
@@ -81 +78 @@
 
             if ( $comment_pagination ) {
+                $pagination_classes = '';
 
                 // If we're only showing the "Next" link, add a class indicating so.
-                if ( strpos( $comment_pagination, 'prev page-numbers' ) === false ) {
+                if ( false === strpos( $comment_pagination, 'prev page-numbers' ) ) {
                     $pagination_classes = ' only-next';
-                } else {
-                    $pagination_classes = '';
                 }
                 ?>
 
-                <nav class="comments-pagination pagination<?php echo esc_attr( $pagination_classes ); ?>" aria-label="<?php esc_attr_e( 'Comments', 'twentytwenty' ); ?>">
+                <nav class="comments-pagination pagination<?php echo $pagination_classes; //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- static output ?>" aria-label="<?php esc_attr_e( 'Comments', 'twentytwenty' ); ?>">
                     <?php echo wp_kses_post( $comment_pagination ); ?>
                 </nav>
@@ -129 +125 @@
     <div class="comment-respond" id="respond">
 
-        <p class="comments-closed"><?php _e( 'Comments are closed.', 'twentytwenty' ); // phpcs:ignore WordPress.Security.EscapeOutput.UnsafePrintingFunction -- core trusts translations ?></p>
+        <p class="comments-closed"><?php _e( 'Comments are closed.', 'twentytwenty' ); ?></p>
 
     </div><!-- #respond -->