Make WordPress Core

Ticket #8154: more-collisions.2.diff

File more-collisions.2.diff, 6.8 KB (added by nbachiyski, 15 years ago)
  • wp-content/themes/classic/comments.php

     
    2121        <li <?php comment_class(); ?> id="comment-<?php comment_ID() ?>">
    2222        <?php echo get_avatar( $comment, 32 ); ?>
    2323        <?php comment_text() ?>
    24         <p><cite><?php comment_type(__('Comment'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
     24        <p><cite><?php comment_type(_c('Comment|noun'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
    2525        </li>
    2626
    2727<?php endforeach; ?>
  • wp-content/themes/classic/comments-popup.php

     
    4949<?php foreach ($comments as $comment) { ?>
    5050        <li id="comment-<?php comment_ID() ?>">
    5151        <?php comment_text() ?>
    52         <p><cite><?php comment_type(__('Comment'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
     52        <p><cite><?php comment_type(_c('Comment|noun'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
    5353        </li>
    5454
    5555<?php } // end for each comment ?>
  • wp-admin/includes/template.php

     
    677677function wp_manage_posts_columns() {
    678678        $posts_columns = array();
    679679        $posts_columns['cb'] = '<input type="checkbox" />';
    680         $posts_columns['title'] = __('Post');
     680        $posts_columns['title'] = _c('Post|noun');
    681681        $posts_columns['author'] = __('Author');
    682682        $posts_columns['categories'] = __('Categories');
    683683        $posts_columns['tags'] = __('Tags');
     
    764764                case 'edit-comments':
    765765                        $_wp_column_headers[$page] = array(
    766766                                'cb' => '<input type="checkbox" />',
    767                                 'comment' => __('Comment'),
     767                                'comment' => _c('Comment|noun'),
    768768                                'author' => __('Author'),
    769769                                'date' => __('Submitted'),
    770770                                'response' => __('In Response To')
     
    19931993                                                }
    19941994                                        }
    19951995                                        if ( 'spam' != $the_comment_status )
    1996                                                 $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a>';
     1996                                                $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . _c( 'Spam|verb' ) . '</a>';
    19971997                                        $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
    19981998                                        $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
    19991999                                        $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
  • wp-admin/comment.php

     
    123123</tr>
    124124<?php } ?>
    125125<tr>
    126 <th scope="row" valign="top"><?php _e('Comment'); ?></th>
     126<th scope="row" valign="top"><?php echo _c('Comment|noun'); ?></th>
    127127<td><?php echo $comment->comment_content; ?></td>
    128128</tr>
    129129</table>
  • wp-admin/edit-form-comment.php

     
    4747<div id="misc-publishing-actions">
    4848
    4949<div class="misc-pub-section" id="comment-status-radio">
    50 <label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _e('Approved') ?></label><br />
    51 <label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _e('Pending') ?></label><br />
    52 <label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|verb'); ?></label>
     50<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php echo _c('Approved|adjective') ?></label><br />
     51<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php echo _c('Pending|adjective') ?></label><br />
     52<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|adjective'); ?></label>
    5353</div>
    5454
    5555<div class="misc-pub-section curtime misc-pub-section-last">
  • wp-admin/edit-form-advanced.php

     
    425425<table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
    426426<thead>
    427427        <tr>
    428     <th scope="col" class="column-comment"><?php _e('Comment') ?></th>
     428    <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
    429429    <th scope="col" class="column-author"><?php _e('Author') ?></th>
    430430    <th scope="col" class="column-date"><?php _e('Submitted') ?></th>
    431431  </tr>
  • wp-admin/edit-pages.php

     
    281281<table class="widefat" cellspacing="0">
    282282<thead>
    283283  <tr>
    284     <th scope="col" class="column-comment"><?php _e('Comment') ?></th>
     284    <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
    285285    <th scope="col" class="column-author"><?php _e('Author') ?></th>
    286286    <th scope="col" class="column-date"><?php _e('Submitted') ?></th>
    287287  </tr>