Make WordPress Core


Ignore:
Timestamp:
12/14/2018 02:32:33 AM (5 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:
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/wp-content/themes/twentynineteen/template-parts/post/discussion-meta.php

    r43808 r44149  
    55 * @package WordPress
    66 * @subpackage Twenty_Nineteen
     7 * @since 1.0.0
    78 */
    89
    910/* Get data from current discussion on post. */
    10 $discussion = twentynineteen_get_discussion_data();
    11 
    12 $comments_number = get_comments_number();
    13 $has_responses   = $discussion->responses > 0;
     11$discussion    = twentynineteen_get_discussion_data();
     12$has_responses = $discussion->responses > 0;
    1413
    1514if ( $has_responses ) {
    16     /* translators: %1(X responses)$s from %2(X others)$s */
    17     $meta_label = sprintf(
    18         '%1$s from %2$s.',
    19         sprintf( _n( '%d response', '%d responses', $discussion->responses, 'twentynineteen' ), $discussion->responses ),
    20         sprintf( _n( '%d other', '%d others', $discussion->commenters, 'twentynineteen' ), $discussion->commenters )
    21     );
    22 } elseif ( $comments_number > 0 ) {
    23     /* Show comment count if not enough discussion information */
    24 
    25     $meta_label = sprintf( _n( '%d Comment', '%d Comments', $comments_number, 'twentynineteen' ), $comments_number );
     15    /* translators: %1(X comments)$s */
     16    $meta_label = sprintf( _n( '%d Comment', '%d Comments', $discussion->responses, 'twentynineteen' ), $discussion->responses );
    2617} else {
    2718    $meta_label = __( 'No comments', 'twentynineteen' );
Note: See TracChangeset for help on using the changeset viewer.