WordPress.org
Get WordPress

Make WordPress Core

Changeset 13384


Ignore:
Timestamp:
02/24/2010 08:45:02 PM (17 years ago)
Author:
wpmuguru
Message:

more multisite UX rebranding, See #11644

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-activate.php

    r13073 r13384  
    6767                                printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of "%2$s".  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
    6868                            } else {
    69                                 printf(__('<p class="lead-in">Your blog at <a href="%1$s">%2$s</a> is active. You may now login to your blog using your chosen username of "%3$s".  Please check your email inbox at %4$s for your password and login instructions.  If you do not receive an email, please check your junk or spam folder.  If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
     69                                printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now login to your site using your chosen username of "%3$s".  Please check your email inbox at %4$s for your password and login instructions.  If you do not receive an email, please check your junk or spam folder.  If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
    7070                            }
    7171                        } else {

  • trunk/wp-signup.php

    r13106 r13384  
    6363        // Blog name
    6464        if ( !is_subdomain_install() )
    65                 echo '<label for="blogname">' . __('Blog Name:') . '</label>';
     65                echo '<label for="blogname">' . __('Site Name:') . '</label>';
    6666        else
    67                 echo '<label for="blogname">' . __('Blog Domain:') . '</label>';
     67                echo '<label for="blogname">' . __('Site Domain:') . '</label>';
    6868
    6969        if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
    … …  
    7979                print '(<strong>' . __( 'Your address will be ' );
    8080                if ( !is_subdomain_install() )
    81                         print $current_site->domain . $current_site->path . __( 'blogname' );
     81                        print $current_site->domain . $current_site->path . __( 'sitename' );
    8282                else
    8383                        print __( 'domain.' ) . $current_site->domain . $current_site->path;
    … …  
    8787        // Blog Title
    8888        ?>
    89         <label for="blog_title"><?php _e('Blog Title:') ?></label>
     89        <label for="blog_title"><?php _e('Site Title:') ?></label>
    9090        <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
    9191                <p class="error"><?php echo $errmsg ?></p>
    … …  
    9797        <p class="privacy-intro">
    9898            <label for="blog_public_on"><?php _e('Privacy:') ?></label>
    99             <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?>
     99            <?php _e('I would like my site to appear in search engines like Google and Technorati, and in public listings around this network.'); ?>
    100100            <div style="clear:both;"></div>
    101101            <label class="checkbox" for="blog_public_on">
    … …  
    161161        $errors = $filtered_results['errors'];
    162162
    163         echo '<h2>' . sprintf( __('Get <em>another</em> %s blog in seconds'), $current_site->site_name ) . '</h2>';
     163        echo '<h2>' . sprintf( __('Get <em>another</em> %s site in seconds'), $current_site->site_name ) . '</h2>';
    164164
    165165        if ( $errors->get_error_code() ) {
    … …  
    167167        }
    168168        ?>
    169         <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>
     169        <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>
    170170
    171171        <?php
    … …  
    173173        if ( !empty($blogs) ) { ?>
    174174                <p>
    175                         <?php _e('Blogs you are already a member of:') ?>
     175                        <?php _e('Sites you are already a member of:') ?>
    176176                        <ul>
    177177                                <?php foreach ( $blogs as $blog ) {
    … …  
    182182        <?php } ?>
    183183
    184         <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p>
     184        <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>
    185185        <form id="setupform" method="post" action="wp-signup.php">
    186186                <input type="hidden" name="stage" value="gimmeanotherblog" />
    187187                <?php do_action( "signup_hidden_fields" ); ?>
    188188                <?php show_blog_form($blogname, $blog_title, $errors); ?>
    189                 <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Blog') ?>" /></p>
     189                <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Site') ?>" /></p>
    190190        </form>
    191191        <?php
    … …  
    217217function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') {
    218218        ?>
    219         <h2><?php printf(__('The blog %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
     219        <h2><?php printf(__('The site %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
    220220        <p>
    221                 <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog.  <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) ?>
     221                <?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) ?>
    222222        </p>
    223223        <?php
    … …  
    256256                <?php } else { ?>
    257257                        <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> />
    258                         <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>
     258                        <label class="checkbox" for="signupblog"><?php _e('Gimme a site!') ?></label>
    259259                        <br />
    260260                        <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
    … …  
    353353function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
    354354        ?>
    355         <h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
    356 
    357         <p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p>
     355        <h2><?php printf(__('Congratulations! Your new site, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
     356
     357        <p><?php _e('But, before you can start using your site, <strong>you must activate it</strong>.') ?></p>
    358358        <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'),  $user_email) ?></p>
    359         <p><?php _e('If you do not activate your blog within two days, you will have to sign up again.'); ?></p>
     359        <p><?php _e('If you do not activate your site within two days, you will have to sign up again.'); ?></p>
    360360        <h2><?php _e('Still waiting for your email?'); ?></h2>
    361361        <p>
    … …  
    392392                $proto = 'http://';
    393393        $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
    394         echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new blog."), $login_url );
     394        echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new site."), $login_url );
    395395} else {
    396396        switch ($_POST['stage']) {
    … …  
    405405                                validate_blog_signup();
    406406                        else
    407                                 _e( "Blog registration has been disabled." );
     407                                _e( "Site registration has been disabled." );
    408408                        break;
    409409                case 'gimmeanotherblog':
    … …  
    428428                                        $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
    429429                                if ( $active_signup == 'blog' || $active_signup == 'all' )
    430                                         printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
     430                                        printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
    431431                                else
    432                                         printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
     432                                        printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
    433433                        }
    434434                        break;
Note: See TracChangeset for help on using the changeset viewer.