Changeset 2477

Timestamp:

03/25/05 21:41:45 (4 years ago)

Author:

ryan

Message:

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

Files:

• trunk/wp-admin/users.php (modified) (1 diff)
• trunk/wp-includes/comment-functions.php (modified) (3 diffs)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-login.php (modified) (2 diffs)
• trunk/wp-register.php (modified) (1 diff)

trunk/wp-admin/users.php

@@ -82 +82 @@
-
-    $user_login = stripslashes($user_login);
-
-
-
-
+
+
+
+
+
-    header('Location: users.php');
-break;

trunk/wp-includes/comment-functions.php

@@ -632 +632 @@
-    
-    if ('comment' == $comment_type) {
-"New comment on your post #$comment->comment_post_ID \"".$post->post_title."\"\r\n
-"Author : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)
-"E-mail : $comment->comment_author_email
-"URI    : $comment->comment_author_url
-"Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP
-"Comment:\r\n $comment->comment_content 
-"You can see all comments on this post here: 
-'[' . $blogname . '] Comment: "' .$post->post_title.'"'
+sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "
+sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "
+sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "
+sprintf( __('URI    : %s'), $comment->comment_author_url ) . "
+sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "
+__('Comment: ') . "\r\n" . $comment->comment_content . "
+__('You can see all comments on this post here: ') . "
+sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title )
-    } elseif ('trackback' == $comment_type) {
-"New trackback on your post #$comment_post_ID \"".$post->post_title."\"\r\n
-"Website: $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)
-"URI    : $comment->comment_author_url
-"Excerpt: \n $comment->comment_content 
-"You can see all trackbacks on this post here: 
-'[' . $blogname . '] Trackback: "' .$post->post_title.'"'
+sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "
+sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "
+sprintf( __('URI    : %s'), $comment->comment_author_url ) . "
+__('Excerpt: ') . "\r\n" . $comment->comment_content . "
+__('You can see all trackbacks on this post here: ') . "
+sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title )
-    } elseif ('pingback' == $comment_type) {
-"New pingback on your post #$comment_post_ID \"".$post->post_title."\"\r\n
-"Website: $comment->comment_author
-"URI    : $comment->comment_author_url
-"Excerpt: \n[...] $comment->comment_content [...]
-"You can see all pingbacks on this post here: 
-'[' . $blogname . '] Pingback: "' .$post->post_title.'"'
-
-'#comments'
-"\r\n\r\nTo delete this comment:\r\n" . get_settings('siteurl') . "/wp-admin/post.php?action=confirmdeletecomment&p=".$comment->comment_post_ID."&comment=$comment_id
+sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "
+sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "
+sprintf( __('URI    : %s'), $comment->comment_author_url ) . "
+__('Excerpt: ') . "\r\n" . sprintf( __('[...] %s [...]'), $comment->comment_content ) . "
+__('You can see all pingbacks on this post here: ') . "
+sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title )
+
+"#comments\r\n\r\n"
+sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n
-
-    if ('' == $comment->comment_author_email || '' == $comment->comment_author) {
@@ -664 +664 @@
-    }
-
-
-
-
+r\
+r\
+r\
-
-    @wp_mail($user->user_email, $subject, $notify_message, $message_headers);
@@ -693 +693 @@
-    $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    return true;

trunk/wp-includes/functions.php

@@ -1654 +1654 @@
-function wp_mail($to, $subject, $message, $headers = '') {
-    if( $headers == '' ) {
-
-
-
+r\
+r\
+r\
-    }
-

trunk/wp-login.php

@@ -103 +103 @@
-    // now insert the new pass md5'd into the db
-    $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
-"Someone has asked to reset the password for the following site and username.\n\n")
-n
+'Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"
+r\n\r
-    $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
-"To reset your password visit the following address, otherwise just ignore this email and nothing will happen.\n\n")
-
-
-"[%s] Password Reset"
+'To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"
+\r\n
+
+'[%s] Password Reset'
-
-    if ($m == false) {
@@ -139 +139 @@
-    $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
-    $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
-'/wp-login.php'
-
-"[%s] Your new password"
+"/wp-login.php\r\n"
+
+'[%s] Your new password'
-
-    if ($m == false) {
- 
-         echo  __('Possible reason: your host may have disabled the mail() function...') . "</p>"
+
+       echo  __('Possible reason: your host may have disabled the mail() function...') . '</p>'
-        die();
-    } else {
-"Your new password is in the mail."
+'Your new password is in the mail.'
-        echo  "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
-        // send a copy of password change notification to the admin
-
+
+
-        die();
-    }

trunk/wp-register.php

@@ -76 +76 @@
-    $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
-    $message .= sprintf(__('Password: %s'), $password) . "\r\n";
-'/wp-login.php'
+"/wp-login.php\r\n"
-    
-"[%s] Your username and password"
+'[%s] Your username and password'
-
-
+
+
+
-
-    @wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message);