Changeset 41704 for trunk/src/wp-includes/pluggable.php

Timestamp:

10/03/2017 01:08:48 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Comments: Change IP references in moderation option labels and email notifications to IP address for clarity.

Props mako09, gk.loveweb, bradparbs.
Fixes #40382.

File:

• trunk/src/wp-includes/pluggable.php (modified) (6 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1470 +1470 @@
                         /* translators: 1: Post title */
                         $notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
-                        /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-                        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                        /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
+                        $notify_message .= sprintf( __('Website: %1$s (IP address: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
                         $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
@@ -1481 +1481 @@
                         /* translators: 1: Post title */
                         $notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
-                        /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-                        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                        /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
+                        $notify_message .= sprintf( __('Website: %1$s (IP address: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
                         $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
@@ -1491 +1491 @@
                 default: // Comments
                         $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
-                        /* translators: 1: comment author, 2: author IP, 3: author domain */
-                        $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                        /* translators: 1: comment author, 2: comment author's IP address, 3: comment author's hostname */
+                        $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1631 +1631 @@
                         $notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
                         $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-                        /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-                        $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                        /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
+                        $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         /* translators: 1: Trackback/pingback/comment author URL */
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1641 +1641 @@
                         $notify_message  = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
                         $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-                        /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-                        $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                        /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
+                        $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         /* translators: 1: Trackback/pingback/comment author URL */
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1651 +1651 @@
                         $notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
                         $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-                        /* translators: 1: Comment author name, 2: comment author's IP, 3: comment author IP's hostname */
-                        $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                        /* translators: 1: Comment author name, 2: comment author's IP address, 3: comment author's hostname */
+                        $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         /* translators: 1: Comment author URL */
                         $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";