Make WordPress Core


Ignore:
Timestamp:
10/03/2017 01:08:48 PM (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/pluggable.php

    r41686 r41704  
    14701470            /* translators: 1: Post title */
    14711471            $notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
    1472             /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
    1473             $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1472            /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1473            $notify_message .= sprintf( __('Website: %1$s (IP address: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    14741474            $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    14751475            $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
     
    14811481            /* translators: 1: Post title */
    14821482            $notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
    1483             /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
    1484             $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1483            /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1484            $notify_message .= sprintf( __('Website: %1$s (IP address: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    14851485            $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    14861486            $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
     
    14911491        default: // Comments
    14921492            $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
    1493             /* translators: 1: comment author, 2: author IP, 3: author domain */
    1494             $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1493            /* translators: 1: comment author, 2: comment author's IP address, 3: comment author's hostname */
     1494            $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    14951495            $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
    14961496            $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
     
    16311631            $notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
    16321632            $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    1633             /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
    1634             $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1633            /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1634            $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    16351635            /* translators: 1: Trackback/pingback/comment author URL */
    16361636            $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
     
    16411641            $notify_message  = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
    16421642            $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    1643             /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
    1644             $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1643            /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1644            $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    16451645            /* translators: 1: Trackback/pingback/comment author URL */
    16461646            $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
     
    16511651            $notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
    16521652            $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    1653             /* translators: 1: Comment author name, 2: comment author's IP, 3: comment author IP's hostname */
    1654             $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1653            /* translators: 1: Comment author name, 2: comment author's IP address, 3: comment author's hostname */
     1654            $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    16551655            /* translators: 1: Comment author URL */
    16561656            $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
Note: See TracChangeset for help on using the changeset viewer.