WordPress.org

Make WordPress Core

Ticket #45151: 45151.5.diff

File 45151.5.diff, 4.4 KB (added by desrosj, 3 years ago)
  • src/wp-admin/includes/upgrade.php

     
    160160
    161161                if ( ! $first_post ) {
    162162                        /* translators: %s: site link */
    163                         $first_post = __( '<!-- wp:paragraph -->
    164 <p>Welcome to %s. This is your first post. Edit or delete it, then start writing!</p>
    165 <!-- /wp:paragraph -->' );
     163                        $first_post = __( '%1$sWelcome to %3$s. This is your first post. Edit or delete it, then start writing!%2$s' );
    166164                }
    167165
    168                 $first_post = sprintf( $first_post,
     166                $first_post = sprintf(
     167                        $first_post,
     168                        '<!-- wp:paragraph --><p>',
     169                        '</p><!-- /wp:paragraph -->',
    169170                        sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
    170171                );
    171172
     
    173174                $first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
    174175                $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
    175176        } else {
    176                 $first_post = __( '<!-- wp:paragraph -->
    177 <p>Welcome to WordPress. This is your first post. Edit or delete it, then start writing!</p>
    178 <!-- /wp:paragraph -->' );
     177                /* Translators: 1: Opening paragraph block markup. 2: Closing paragraph block markup. */
     178                $first_post = sprintf(
     179                        __( '%1$sWelcome to WordPress. This is your first post. Edit or delete it, then start writing!%2$s' ),
     180                        '<!-- wp:paragraph --><p>',
     181                        '</p><!-- /wp:paragraph -->'
     182                );
    179183        }
    180184
    181185        $wpdb->insert( $wpdb->posts, array(
     
    225229        if ( is_multisite() )
    226230                $first_page = get_site_option( 'first_page' );
    227231
    228         $first_page = ! empty( $first_page ) ? $first_page : sprintf( __( "<!-- wp:paragraph -->
    229 <p>This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:</p>
    230 <!-- /wp:paragraph -->
     232        if ( empty( $first_page ) ) {
     233                $first_page = sprintf(
     234                        /* translators: Sample page content. 1: Site admin URL, 2: Opening paragraph block markup. 3: Closing
     235                        paragraph block markup. 4. Opening quote block markup. 5: Closing quote block markup. */
     236                        __( '%2$sThis is an example page. It\'s different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:%3$s
    231237
    232 <!-- wp:quote -->
    233 <blockquote class=\"wp-block-quote\"><p>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</p></blockquote>
    234 <!-- /wp:quote -->
     238%4$sHi there! I\'m a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin\' caught in the rain.)%5$s
    235239
    236 <!-- wp:paragraph -->
    237 <p>...or something like this:</p>
    238 <!-- /wp:paragraph -->
     240%2$s...or something like this:%3$s
    239241
    240 <!-- wp:quote -->
    241 <blockquote class=\"wp-block-quote\"><p>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</p></blockquote>
    242 <!-- /wp:quote -->
     242%4$sThe XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.%5$s
    243243
    244 <!-- wp:paragraph -->
    245 <p>As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!</p>
    246 <!-- /wp:paragraph -->" ), admin_url() );
     244%2$sAs a new WordPress user, you should go to <a href="%1$s">your dashboard</a> to delete this page and create new pages for your content. Have fun!%3$s' ),
     245                        admin_url(),
     246                        '<!-- wp:paragraph --><p>',
     247                        '</p><!-- /wp:paragraph -->',
     248                        '<!-- wp:quote --><blockquote class="wp-block-quote"><p>',
     249                        '</p></blockquote><!-- /wp:quote -->'
     250                );
     251        }
    247252
    248253        $first_post_guid = get_option('home') . '/?page_id=2';
    249254        $wpdb->insert( $wpdb->posts, array(