WordPress.org

Make WordPress Core

Ticket #8154: spam-plural-verb-adjective-collision.diff

File spam-plural-verb-adjective-collision.diff, 2.9 KB (added by nbachiyski, 7 years ago)
  • wp-includes/comment.php

     
    253253        $status = array( 
    254254                'hold'          => __('Unapproved'), 
    255255                'approve'       => __('Approved'), 
    256                 'spam'          => __('Spam'), 
     256                'spam'          => _c('Spam|adjective'), 
    257257        ); 
    258258 
    259259        return $status; 
  • wp-admin/includes/dashboard.php

     
    430430                $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>'; 
    431431                $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>'; 
    432432                $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>'; 
    433                 $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>'; 
     433                $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>'; 
    434434                $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>'; 
    435435 
    436436                $actions = apply_filters( 'comment_row_actions', $actions, $comment ); 
  • wp-admin/edit-form-comment.php

     
    4949<div class="misc-pub-section" id="comment-status-radio"> 
    5050<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _e('Approved') ?></label><br /> 
    5151<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _e('Awaiting Moderation') ?></label><br /> 
    52 <label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php _e('Spam') ?></label> 
     52<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|verb'); ?></label> 
    5353</div> 
    5454 
    5555<div class="misc-pub-section curtime misc-pub-section-last">