WordPress.org
Get WordPress

Make WordPress Core

Changeset 14070 for trunk/wp-signup.php


Ignore:
Timestamp:
04/11/2010 10:41:54 AM (15 years ago)
Author:
dd32
Message:

Tweak new strings for better typography. Props demetris. Fixes #12962

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-signup.php

    r13733 r14070  
    8484        else
    8585            print __( 'domain.' ) . $current_site->domain . $current_site->path;
    86         echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';
     86        echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
    8787    }
    8888
    … …  
    131131    }
    132132    echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="50" /><br />';
    133     _e('(Must be at least 4 characters, letters and numbers only.)');
    134     ?>
    135 
    136     <label for="user_email"><?php _e('Email&nbsp;Address:') ?></label>
     133    _e( '(Must be at least 4 characters, letters and numbers only.)' );
     134    ?>
     135
     136    <label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
    137137    <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
    138138        <p class="error"><?php echo $errmsg ?></p>
    … …  
    141141    <?php
    142142    if ( $errmsg = $errors->get_error_message('generic') ) {
    143         echo '<p class="error">'.$errmsg.'</p>';
     143        echo '<p class="error">' . $errmsg . '</p>';
    144144    }
    145145    do_action( 'signup_extra_fields', $errors );
    … …  
    163163    $errors = $filtered_results['errors'];
    164164
    165     echo '<h2>' . sprintf( __('Get <em>another</em> %s site in seconds'), $current_site->site_name ) . '</h2>';
     165    echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), $current_site->site_name ) . '</h2>';
    166166
    167167    if ( $errors->get_error_code() ) {
    168         echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>";
    169     }
    170     ?>
    171     <p><?php printf(__("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's content, but write responsibly."), $current_user->display_name) ?></p>
     168        echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
     169    }
     170    ?>
     171    <p><?php printf( __( '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!' ), $current_user->display_name ) ?></p>
    172172
    173173    <?php
    … …  
    175175    if ( !empty($blogs) ) { ?>
    176176        <p>
    177             <?php _e('Sites you are already a member of:') ?>
     177            <?php _e( 'Sites you are already a member of:' ) ?>
    178178            <ul>
    179179                <?php foreach ( $blogs as $blog ) {
    … …  
    184184    <?php } ?>
    185185
    186     <p><?php _e("If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!") ?></p>
     186    <p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p>
    187187    <form id="setupform" method="post" action="wp-signup.php">
    188188        <input type="hidden" name="stage" value="gimmeanotherblog" />
    189189        <?php do_action( "signup_hidden_fields" ); ?>
    190190        <?php show_blog_form($blogname, $blog_title, $errors); ?>
    191         <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Site') ?>" /></p>
     191        <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
    192192    </form>
    193193    <?php
    … …  
    209209
    210210    $public = (int) $_POST['blog_public'];
    211     $meta = apply_filters('signup_create_blog_meta', array ('lang_id' => 1, 'public' => $public)); // deprecated
    212     $meta = apply_filters( "add_signup_meta", $meta );
     211    $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated
     212    $meta = apply_filters( 'add_signup_meta', $meta );
    213213
    214214    wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
    … …  
    219219function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') {
    220220    ?>
    221     <h2><?php printf(__('The site %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
     221    <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
    222222    <p>
    223         <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new site.  <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
     223        <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site.  <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
    224224    </p>
    225225    <?php
    226     do_action('signup_finished');
     226    do_action( 'signup_finished' );
    227227}
    228228
    … …  
    248248    ?>
    249249
    250     <h2><?php printf( __('Get your own %s account in seconds'), $current_site->site_name ) ?></h2>
     250    <h2><?php printf( __( 'Get your own %s account in seconds' ), $current_site->site_name ) ?></h2>
    251251    <form id="setupform" method="post" action="wp-signup.php">
    252252        <input type="hidden" name="stage" value="validate-user-signup" />
    … …  
    295295function confirm_user_signup($user_name, $user_email) {
    296296    ?>
    297     <h2><?php printf(__('%s is your new username'), $user_name) ?></h2>
    298     <p><?php _e('But, before you can start using your new username, <strong>you must activate it</strong>.') ?></p>
    299     <p><?php printf(__('Check your inbox at <strong>%1$s</strong> and click the link given.'),  $user_email) ?></p>
    300     <p><?php _e('If you do not activate your username within two days, you will have to sign up again.'); ?></p>
    301     <?php
    302     do_action('signup_finished');
     297    <h2><?php printf( __( '%s is your new username' ), $user_name) ?></h2>
     298    <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p>
     299    <p><?php printf(__( 'Check your inbox at <strong>%1$s</strong> and click the link given.' ),  $user_email) ?></p>
     300    <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
     301    <?php
     302    do_action( 'signup_finished' );
    303303}
    304304
    … …  
    358358function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
    359359    ?>
    360     <h2><?php printf(__('Congratulations! Your new site, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
    361 
    362     <p><?php _e('But, before you can start using your site, <strong>you must activate it</strong>.') ?></p>
    363     <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'),  $user_email) ?></p>
    364     <p><?php _e('If you do not activate your site within two days, you will have to sign up again.'); ?></p>
    365     <h2><?php _e('Still waiting for your email?'); ?></h2>
     360    <h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
     361
     362    <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
     363    <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.' ),  $user_email) ?></p>
     364    <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
     365    <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
    366366    <p>
    367         <?php _e("If you haven't received your email yet, there are a number of things you can do:") ?>
     367        <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
    368368        <ul id="noemail-tips">
    369             <li><p><strong><?php _e('Wait a little longer.  Sometimes delivery of email can be delayed by processes outside of our control.') ?></strong></p></li>
    370             <li><p><?php _e('Check the junk email or spam folder of your email client.  Sometime emails wind up there by mistake.') ?></p></li>
    371             <li><?php printf(__("Have you entered your email correctly?  We think it's %s but if you've entered it incorrectly, you won't receive it."), $user_email) ?></li>
     369            <li><p><strong><?php _e( 'Wait a little longer.  Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
     370            <li><p><?php _e( 'Check the junk or spam folder of your email client.  Sometime emails wind up there by mistake.' ) ?></p></li>
     371            <li><?php printf( __( 'Have you entered your email correctly?  We think it&#8217;s %s but if you have entered it incorrectly, you will not receive it.' ), $user_email ) ?></li>
    372372        </ul>
    373373    </p>
    374374    <?php
    375     do_action('signup_finished');
     375    do_action( 'signup_finished' );
    376376}
    377377
    … …  
    384384
    385385if ( is_super_admin() )
    386     echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/ms-options.php'>Options page</a>." ), $active_signup ) . '</div>';
     386    echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="wp-admin/ms-options.php">Options page</a>.' ), $active_signup ) . '</div>';
    387387
    388388$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
    … …  
    390390$current_user = wp_get_current_user();
    391391if ( $active_signup == "none" ) {
    392     _e( "Registration has been disabled." );
     392    _e( 'Registration has been disabled.' );
    393393} elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
    394394    if ( is_ssl() )
    … …  
    397397        $proto = 'http://';
    398398    $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
    399     echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new site."), $login_url );
     399    echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
    400400} else {
    401401    $stage = isset( $_POST['stage'] ) ?  $_POST['stage'] : 'default';
    … …  
    405405                validate_user_signup();
    406406            else
    407                 _e( "User registration has been disabled." );
     407                _e( 'User registration has been disabled.' );
    408408        break;
    409409        case 'validate-blog-signup':
    … …  
    411411                validate_blog_signup();
    412412            else
    413                 _e( "Site registration has been disabled." );
     413                _e( 'Site registration has been disabled.' );
    414414            break;
    415415        case 'gimmeanotherblog':
    … …  
    425425                signup_user( $newblogname, $user_email );
    426426            elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
    427                 _e( "I'm sorry. We're not accepting new registrations at this time." );
     427                _e( 'We are sorry. We are not accepting new registrations at this time.' );
    428428            else
    429                 _e( "You're logged in already. No need to register again!" );
     429                _e( 'You are logged in already. No need to register again!' );
    430430
    431431            if ($newblogname) {
    … …  
    435435                    $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
    436436                if ( $active_signup == 'blog' || $active_signup == 'all' )
    437                     printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
     437                    printf( __( '<p><em>The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!</em></p>' ), $newblog );
    438438                else
    439                     printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
     439                    printf( __( '<p><em>The site you were looking for, <strong>%s</strong>, does not exist.</em></p>' ), $newblog );
    440440            }
    441441            break;
Note: See TracChangeset for help on using the changeset viewer.