Changeset 44149 for trunk/src/wp-content/themes/twentynineteen/comments.php

Timestamp:

12/14/2018 02:32:33 AM (7 years ago)

Author:

pento

Message:

Default Themes: Import Twenty Nineteen from the 5.0 branch.

Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.

Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.

Fixes #45424.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentynineteen (copied) (copied from branches/5.0/src/wp-content/themes/twentynineteen)
• src/wp-content/themes/twentynineteen/comments.php (modified) (5 diffs)

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

@@ -10 +10 @@
  * @package WordPress
  * @subpackage Twenty_Nineteen
+ * @since 1.0.0
  */
 
 /*
-If the current post is protected by a password and
+ * If the current post is protected by a password and
  * the visitor has not yet entered the password we will
  * return early without loading the comments.
@@ -21 +22 @@
 }
 
+$discussion = twentynineteen_get_discussion_data();
 ?>
 
 <div id="comments" class="<?php echo comments_open() ? 'comments-area' : 'comments-area comments-closed'; ?>">
-    <div class="<?php echo twentynineteen_get_discussion_data()->responses > 0 ? 'comments-title-wrap' : 'comments-title-wrap no-responses'; ?>">
+    <div class="<?php echo $discussion->responses > 0 ? 'comments-title-wrap' : 'comments-title-wrap no-responses'; ?>">
         <h2 class="comments-title">
         <?php
             if ( comments_open() ) {
                 if ( have_comments() ) {
-                    echo esc_html_e( 'Join the Conversation', 'twentynineteen' );
+                    _e( 'Join the Conversation', 'twentynineteen' );
                 } else {
-                    echo esc_html_e( 'Leave a comment', 'twentynineteen' );
+                    _e( 'Leave a comment', 'twentynineteen' );
                 }
             } else {
-                $comments_number = get_comments_number();
-                if ( '1' === $comments_number ) {
+                if ( '1' == $discussion->responses ) {
                     /* translators: %s: post title */
                     printf( _x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentynineteen' ), get_the_title() );
@@ -44 +45 @@
                             '%1$s reply on &ldquo;%2$s&rdquo;',
                             '%1$s replies on &ldquo;%2$s&rdquo;',
-                            $comments_number,
+                            $discussion->responses,
                             'comments title',
                             'twentynineteen'
                         ),
-                        number_format_i18n( $comments_number ),
+                        number_format_i18n( $discussion->responses ),
                         get_the_title()
                     );
@@ -85 +86 @@
         <?php
 
-        // Show comment form at bottom if showing newest comments at the bottom.
-        if ( comments_open() && 'asc' === strtolower( get_option( 'comment_order', 'asc' ) ) ) :
-            ?>
-            <div class="comment-form-flex">
-                <span class="screen-reader-text"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></span>
-                <?php twentynineteen_comment_form( 'asc' ); ?>
-                <h2 class="comments-title" aria-hidden="true"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></h2>
-            </div>
-            <?php
-        endif;
-
         // Show comment navigation
         if ( have_comments() ) :
@@ -109 +99 @@
         endif;
 
+        // Show comment form at bottom if showing newest comments at the bottom.
+        if ( comments_open() && 'asc' === strtolower( get_option( 'comment_order', 'asc' ) ) ) :
+            ?>
+            <div class="comment-form-flex">
+                <span class="screen-reader-text"><?php _e( 'Leave a comment', 'twentynineteen' ); ?></span>
+                <?php twentynineteen_comment_form( 'asc' ); ?>
+                <h2 class="comments-title" aria-hidden="true"><?php _e( 'Leave a comment', 'twentynineteen' ); ?></h2>
+            </div>
+            <?php
+        endif;
+
         // If comments are closed and there are comments, let's leave a little note, shall we?
         if ( ! comments_open() ) :
             ?>
             <p class="no-comments">
-                <?php esc_html_e( 'Comments are closed.', 'twentynineteen' ); ?>
+                <?php _e( 'Comments are closed.', 'twentynineteen' ); ?>
             </p>
             <?php