WordPress.org
Get WordPress

Make WordPress Core

Ticket #10005: translators-entities-warning.diff

File translators-entities-warning.diff, 18.4 KB (added by xibe, 17 years ago)

Patch for all related files.

  • wp-admin/includes/upgrade.php

     
    226226        $user = new WP_User($user_id);
    227227        $email = $user->user_email;
    228228        $name = $user->user_login;
     229  /* translators: do not use HTML entities ( , etc.): string is used in e-mails */
    229230        $message = sprintf(__("Your new WordPress blog has been successfully set up at:
    230231
    231232%1\$s

  • wp-includes/feed-atom-comments.php

     
    1616>
    1717        <title type="text"><?php
    1818                if ( is_singular() )
     19      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    1920                        printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
    2021                elseif ( is_search() )
     22      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    2123                        printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), esc_attr(get_search_query()));
    2224                else
     25      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    2326                        printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
    2427        ?></title>
    2528        <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
    … …  
    5154                        if ( !is_singular() ) {
    5255                                $title = get_the_title($comment_post->ID);
    5356                                $title = apply_filters('the_title_rss', $title);
     57        /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    5458                                printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
    5559                        } else {
     60        /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    5661                                printf(ent2ncr(__('By: %s')), get_comment_author_rss());
    5762                        }
    5863                ?></title>

  • wp-includes/feed-rss2-comments.php

     
    1919<channel>
    2020        <title><?php
    2121                if ( is_singular() )
     22      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    2223                        printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
    2324                elseif ( is_search() )
     25      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    2426                        printf(ent2ncr(__('Comments for %s searching on %s')), get_bloginfo_rss( 'name' ), esc_attr($wp_query->query_vars['s']));
    2527                else
     28      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    2629                        printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
    2730        ?></title>
    2831        <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    … …  
    4346                        if ( !is_singular() ) {
    4447                                $title = get_the_title($comment_post->ID);
    4548                                $title = apply_filters('the_title_rss', $title);
     49        /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    4650                                printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
    4751                        } else {
     52        /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    4853                                printf(ent2ncr(__('By: %s')), get_comment_author_rss());
    4954                        }
    5055                ?></title>
    … …  
    5358                <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true, false), false); ?></pubDate>
    5459                <guid isPermaLink="false"><?php comment_guid() ?></guid>
    5560<?php if ( post_password_required($comment_post) ) : ?>
     61    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in XML feeds */
    5662                <description><?php echo ent2ncr(__('Protected Comments: Please enter your password to view comments.')); ?></description>
    5763                <content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
    5864<?php else : // post pass ?>

  • wp-includes/js/tinymce/langs/wp-langs.php

     
    418418});
    419419
    420420tinyMCE.addI18n("' . $language . '.wpeditimage",{
    421 edit_img:"' . mce_escape( __('Edit Image') )  . '",
    422 del_img:"' . mce_escape( __('Delete Image') )  . '",
     421edit_img:"' /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in Visual Editor */ . mce_escape( __('Edit Image') )  . '",
     422del_img:"' /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in Visual Editor */ . mce_escape( __('Delete Image') )  . '",
    423423adv_settings:"' . mce_escape( __('Advanced Settings') )  . '",
    424424none:"' . mce_escape( __('None') )  . '",
    425425size:"' . mce_escape( __('Size') ) . '",

  • wp-includes/pluggable.php

     
    964964        if ( empty( $comment_type ) ) $comment_type = 'comment';
    965965
    966966        if ('comment' == $comment_type) {
    967                 /* translators: 1: post id, 2: post title */
     967                /* translators: 1: post id, 2: post title. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    968968                $notify_message  = sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
    969                 /* translators: 1: comment author, 2: author IP, 3: author domain */
     969                /* translators: 1: comment author, 2: author IP, 3: author domain. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    970970                $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     971    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    971972                $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
     973    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    972974                $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
     975    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    973976                $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
     977    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    974978                $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
     979    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    975980                $notify_message .= __('You can see all comments on this post here: ') . "\r\n";
    976                 /* translators: 1: blog name, 2: post title */
     981                /* translators: 1: blog name, 2: post title. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    977982                $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
    978983        } elseif ('trackback' == $comment_type) {
    979                 /* translators: 1: post id, 2: post title */
     984                /* translators: 1: post id, 2: post title. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    980985                $notify_message  = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
    981                 /* translators: 1: website name, 2: author IP, 3: author domain */
     986                /* translators: 1: website name, 2: author IP, 3: author domain. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    982987                $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     988    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    983989                $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
     990    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    984991                $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
     992    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    985993                $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
    986                 /* translators: 1: blog name, 2: post title */         
     994                /* translators: 1: blog name, 2: post title. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */               
    987995                $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
    988996        } elseif ('pingback' == $comment_type) {
    989                 /* translators: 1: post id, 2: post title */
     997                /* translators: 1: post id, 2: post title. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    990998                $notify_message  = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
    991                 /* translators: 1: comment author, 2: author IP, 3: author domain */
     999                /* translators: 1: comment author, 2: author IP, 3: author domain. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    9921000                $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1001    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    9931002                $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
     1003    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    9941004                $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n";
     1005    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    9951006                $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n";
    996                 /* translators: 1: blog name, 2: post title */
     1007                /* translators: 1: blog name, 2: post title. Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    9971008                $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
    9981009        }
    9991010        $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
     1011  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10001012        $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n";
     1013  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10011014        $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n";
    10021015
    10031016        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
    … …  
    10531066        switch ($comment->comment_type)
    10541067        {
    10551068                case 'trackback':
     1069      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10561070                        $notify_message  = sprintf( __('A new trackback on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
    10571071                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
     1072      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10581073                        $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1074      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10591075                        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
     1076      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10601077                        $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
    10611078                        break;
    10621079                case 'pingback':
     1080      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10631081                        $notify_message  = sprintf( __('A new pingback on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
    10641082                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
     1083      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10651084                        $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1085      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10661086                        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
     1087      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10671088                        $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
    10681089                        break;
    10691090                default: //Comments
     1091      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10701092                        $notify_message  = sprintf( __('A new comment on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
    10711093                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
     1094      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10721095                        $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1096      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10731097                        $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
     1098      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10741099                        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
     1100      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10751101                        $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
     1102      /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10761103                        $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
    10771104                        break;
    10781105        }
    10791106
     1107  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10801108        $notify_message .= sprintf( __('Approve it: %s'),  admin_url("comment.php?action=mac&c=$comment_id") ) . "\r\n";
     1109  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10811110        $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n";
     1111  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10821112        $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n";
    10831113
     1114    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10841115        $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
    10851116                'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
    10861117        $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";
    10871118
     1119  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    10881120        $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title );
    10891121        $admin_email = get_option('admin_email');
    10901122        $message_headers = '';
    … …  
    11111143        // send a copy of password change notification to the admin
    11121144        // but check to see if it's the admin whose password we're changing, and skip this
    11131145        if ( $user->user_email != get_option('admin_email') ) {
     1146    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11141147                $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
     1148    /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11151149                wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
    11161150        }
    11171151}
    … …  
    11321166        $user_login = stripslashes($user->user_login);
    11331167        $user_email = stripslashes($user->user_email);
    11341168
     1169  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11351170        $message  = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
     1171  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11361172        $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
     1173  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11371174        $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
    11381175
     1176  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11391177        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), get_option('blogname')), $message);
    11401178
    11411179        if ( empty($plaintext_pass) )
    11421180                return;
    11431181
     1182  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11441183        $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
     1184  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11451185        $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
    11461186        $message .= wp_login_url() . "\r\n";
    11471187
     1188  /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in e-mails */
    11481189        wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message);
    11491190
    11501191}

  • wp-includes/script-loader.php

     
    7373        $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20090307' );
    7474        $scripts->localize( 'quicktags', 'quicktagsL10n', array(
    7575                'quickLinks' => __('(Quick Links)'),
    76                 'wordLookup' => __('Enter a word to look up:'),
     76                'wordLookup' => /* translators: Note: do not use HTML entities (&nbsp;, etc.): string is used in JavaScript alert() message */ __('Enter a word to look up:'),
    7777                'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
    7878                'lookup' => esc_attr(__('lookup')),
    7979                'closeAllOpenTags' => esc_attr(__('Close all open tags')),