Make WordPress Core

Changeset 2477 for trunk/wp-login.php


Ignore:
Timestamp:
03/25/2005 09:41:45 PM (19 years ago)
Author:
ryan
Message:

Localize email messages. http://mosquito.wordpress.org/view.php?id=1168 Props: slebog

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-login.php

    r2465 r2477  
    103103    // now insert the new pass md5'd into the db
    104104    $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
    105     $message .= __("Someone has asked to reset the password for the following site and username.\n\n");
    106     $message .= get_option('siteurl') . "\n\n";
     105    $message .= __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
     106    $message .= get_option('siteurl') . "\r\n\r\n";
    107107    $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
    108     $message .= __("To reset your password visit the following address, otherwise just ignore this email and nothing will happen.\n\n");
    109     $message .= get_settings('siteurl') . "/wp-login.php?action=resetpass&key=$key";
    110 
    111     $m = wp_mail($user_email, sprintf(__("[%s] Password Reset"), get_settings('blogname')), $message);
     108    $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
     109    $message .= get_settings('siteurl') . "/wp-login.php?action=resetpass&key=$key\r\n";
     110
     111    $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_settings('blogname')), $message);
    112112
    113113    if ($m == false) {
     
    139139    $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
    140140    $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
    141     $message .= get_settings('siteurl') . '/wp-login.php';
    142 
    143     $m = wp_mail($user->user_email, sprintf(__("[%s] Your new password"), get_settings('blogname')), $message);
     141    $message .= get_settings('siteurl') . "/wp-login.php\r\n";
     142
     143    $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_settings('blogname')), $message);
    144144
    145145    if ($m == false) {
    146          echo '<p>' . __('The e-mail could not be sent.') . "<br />\n";
    147          echo  __('Possible reason: your host may have disabled the mail() function...') . "</p>";
     146        echo '<p>' . __('The e-mail could not be sent.') . "<br />\n";
     147        echo  __('Possible reason: your host may have disabled the mail() function...') . '</p>';
    148148        die();
    149149    } else {
    150         echo '<p>' .  sprintf(__("Your new password is in the mail."), $user_login) . '<br />';
     150        echo '<p>' .  sprintf(__('Your new password is in the mail.'), $user_login) . '<br />';
    151151        echo  "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
    152152        // send a copy of password change notification to the admin
    153         wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user->user_login));
     153        $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
     154        wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), $message);
    154155        die();
    155156    }
Note: See TracChangeset for help on using the changeset viewer.