Changeset 1138

Show
Ignore:
Timestamp:
10/30/07 16:48:23 (1 year ago)
Author:
donncha
Message:

Minor text changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/wpmu-functions.php

    r1134 r1138  
    10661066        $message = sprintf(__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s"), $activate_url, "http://{$domain}{$path}"); 
    10671067        // TODO: Don't hard code activation link. 
    1068         $subject = sprintf(__('Activate %s'), $domain.$path); 
     1068        $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s'), 'http://' . $domain . $path); 
    10691069        wp_mail($user_email, $subject, $message, $message_headers); 
    10701070} 

  • trunk/wp-signup.php

    r1115 r1138  
    224224function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta) { 
    225225?> 
    226 <h2><?php printf(__('%s Is Yours'), $domain.$path ) ?></h2> 
     226<h2><?php printf(__('The blog %s is yours.'), $domain.$path ) ?></h2> 
    227227<p><?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) ?></p> 
    228228<?php 
    …… 
    303303function confirm_user_signup($user_name, $user_email) { 
    304304?> 
    305 <h2><?php printf(__('%s Is Your New Username'), $user_name) ?></h2> 
     305<h2><?php printf(__('%s is your new username'), $user_name) ?></h2> 
    306306<p><?php _e('But, before you can start using your new username, <strong>you must activate it</strong>.') ?></p> 
    307307<p><?php printf(__('Check your inbox at <strong>%1$s</strong> and click the link given.  '),  $user_email) ?></p> 
    …… 
    370370function confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta) { 
    371371?> 
    372 <h2><?php printf(__('%s Is Yours'), $domain.$path) ?></h2> 
     372<h2><?php printf(__('The blog %s is yours'), $domain.$path) ?></h2> 
    373373<p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p> 
    374374<p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given.  '),  $user_email) ?></p>