WordPress.org

Make WordPress Core

Changeset 14161


Ignore:
Timestamp:
04/19/10 12:01:32 (5 years ago)
Author:
nbachiyski
Message:

Take out opening and closing <p> tags from translation strings. Focus on the key input on page load.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-activate.php

    r14139 r14161  
    6464                <h2><?php _e('Your account is now active!'); ?></h2> 
    6565                <?php 
    66                 if ( $signup->domain . $signup->path == '' ) { 
    67                     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 &#8220;%2$s&#8221;.  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>'), network_site_url('wp-login.php', 'login'), $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword', 'login')); 
    68                 } else { 
    69                     printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;.  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, network_site_url('wp-login.php?action=lostpassword')); 
    70                 } 
     66                echo '<p class="lead-in">'; 
     67                if ( $signup->domain . $signup->path == '' ) { 
     68                    printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;.  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>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); 
     69                } else { 
     70                    printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;.  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>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) ); 
     71                } 
     72                echo '</p>'; 
    7173            } else { 
    7274                ?> 
     
    8890 
    8991            <?php if ( $url != network_home_url('', 'http') ) : ?> 
    90                 <p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p> 
     92                <p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p> 
    9193            <?php else: ?> 
    92                 <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p> 
     94                <p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p> 
    9395            <?php endif; 
    9496        } 
     
    9698    ?> 
    9799</div> 
    98  
     100<script type="text/javascript"> 
     101    var key_input = document.getElementById('key'); 
     102    key_input && key_input.focus(); 
     103</script> 
    99104<?php get_footer(); ?> 
Note: See TracChangeset for help on using the changeset viewer.