WordPress.org
Get WordPress

Make WordPress Core

Ticket #49059: 49059.2.diff

File 49059.2.diff, 5.8 KB (added by SergeyBiryukov, 5 years ago)

  • src/wp-signup.php

     
    344344        if ( $errors->has_errors() ) {
    345345                echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
    346346        }
    347         ?>
    348         <p>
    349                 <?php
    350                 printf(
    351                         /* translators: %s: Current user's display name. */
    352                         __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ),
    353                         $current_user->display_name
    354                 );
    355                 ?>
    356         </p>
    357347
    358         <?php
     348        echo '<p>' . sprintf(
     349                /* translators: %s: Current user's display name. */
     350                __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ),
     351                $current_user->display_name
     352        ) . '</p>';
     353
    359354        $blogs = get_blogs_of_user( $current_user->ID );
    360355        if ( ! empty( $blogs ) ) {
    361356                ?>
    … …  
    515510                $blog_title
    516511        );
    517512
    518         ?>
    519         <h2>
    520         <?php
     513        echo '<h2>' . sprintf(
    521514                /* translators: %s: Site title. */
    522                 printf( __( 'The site %s is yours.' ), $site );
    523         ?>
    524         </h2>
    525         <p>
    526                 <?php
    527                 printf(
    528                         /* translators: 1: Link to new site, 2: Login URL, 3: Username. */
    529                         __( '%1$s is your new site. <a href="%2$s">Log in</a> as &#8220;%3$s&#8221; using your existing password.' ),
    530                         sprintf(
    531                                 '<a href="%s">%s</a>',
    532                                 esc_url( $home_url ),
    533                                 untrailingslashit( $domain . $path )
    534                         ),
    535                         esc_url( $login_url ),
    536                         $user_name
    537                 );
    538                 ?>
    539         </p>
    540         <?php
     515                __( 'The site %s is yours.' ),
     516                $site
     517        ) . '</h2>';
     518
     519        echo '<p>' . srintf(
     520                /* translators: 1: Link to new site, 2: Login URL, 3: Username. */
     521                __( '%1$s is your new site. <a href="%2$s">Log in</a> as &#8220;%3$s&#8221; using your existing password.' ),
     522                sprintf(
     523                        '<a href="%s">%s</a>',
     524                        esc_url( $home_url ),
     525                        untrailingslashit( $domain . $path )
     526                ),
     527                esc_url( $login_url ),
     528                $user_name
     529        ) . '</p>';
     530
    541531        /**
    542532         * Fires when the site or user sign-up process is complete.
    543533         *
    … …  
    588578        $user_email       = $filtered_results['user_email'];
    589579        $errors           = $filtered_results['errors'];
    590580
    591         ?>
    592 
    593         <h2>
    594         <?php
     581        echo '<h2>' . sprintf(
    595582                /* translators: %s: Name of the network. */
    596                 printf( __( 'Get your own %s account in seconds' ), get_network()->site_name );
     583                __( 'Get your own %s account in seconds' ),
     584                get_network()->site_name
     585        ) . '</h2>';
    597586        ?>
    598         </h2>
    599587        <form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
    600588                <input type="hidden" name="stage" value="validate-user-signup" />
    601589                <?php
    … …  
    662650 * @param string $user_email The user's email address
    663651 */
    664652function confirm_user_signup( $user_name, $user_email ) {
    665         ?>
    666         <h2>
    667         <?php
    668         /* translators: %s: Username. */
    669         printf( __( '%s is your new username' ), $user_name )
    670         ?>
    671         </h2>
    672         <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ); ?></p>
    673         <p>
    674         <?php
    675         /* translators: %s: Email address. */
    676         printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' );
    677         ?>
    678         </p>
    679         <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
    680         <?php
     653        echo '<h2>' . sprintf(
     654                /* translators: %s: Username. */
     655                __( '%s is your new username' ),
     656                $user_name
     657        ) . '</h2>';
     658
     659        echo '<p>' . __( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) . '</p>';
     660
     661        echo '<p>' . sprintf(
     662                /* translators: %s: Email address. */
     663                __( 'Check your inbox at %s and click the link given.' ),
     664                '<strong>' . $user_email . '</strong>'
     665        ) . '</p>';
     666
     667        echo '<p>' . __( 'If you do not activate your username within two days, you will have to sign up again.' ) . '</p>';
     668
    681669        /** This action is documented in wp-signup.php */
    682670        do_action( 'signup_finished' );
    683671}
    … …  
    819807 * @param array $meta Any additional meta from the {@see 'add_signup_meta'} filter in validate_blog_signup()
    820808 */
    821809function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
    822         ?>
    823         <h2>
    824         <?php
    825         /* translators: %s: Site address. */
    826         printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" )
    827         ?>
    828         </h2>
     810        echo '<h2>' . sprintf(
     811                /* translators: %s: Site address. */
     812                __( 'Congratulations! Your new site, %s, is almost ready.' ),
     813                "<a href='http://{$domain}{$path}'>{$blog_title}</a>"
     814        ) . '</h2>';
    829815
    830         <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ); ?></p>
    831         <p>
    832         <?php
    833         /* translators: %s: Email address. */
    834         printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' );
     816        echo '<p>' . __( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) . '</p>';
     817
     818        echo '<p>' . sprintf(
     819                /* translators: %s: Email address. */
     820                __( 'Check your inbox at %s and click the link given.' ),
     821                '<strong>' . $user_email . '</strong>'
     822        ) . '</p>';
     823
     824        echo '<p>' . __( 'If you do not activate your site within two days, you will have to sign up again.' ) . '</p>';
     825
     826        echo '<h2>' . __( 'Still waiting for your email?' ) . '</h2>';
    835827        ?>
    836         </p>
    837         <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
    838         <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
    839828        <p>
    840829                <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ); ?>
    841830                <ul id="noemail-tips">