golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Give context to more translations to allow for differentiation between plural noun, verb and adjective translations. Fixes #8154 props nbachiyski. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9835 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-11-21 18:16:44 +00:00
parent b6da4f7a13
commit 61fb6ea540
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/comment.php
View File

@ -123,7 +123,7 @@ if ( 'spam' == $_GET['dt'] ) {
</tr>
<?php } ?>
<tr>
<th scope="row" valign="top"><?php _e('Comment'); ?></th>
<th scope="row" valign="top"><?php echo _c('Comment|noun'); ?></th>
<td><?php echo $comment->comment_content; ?></td>
</tr>
</table>

2
wp-admin/edit-form-advanced.php
View File

@ -425,7 +425,7 @@ wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
<table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
<thead>
<tr>
<th scope="col" class="column-comment"><?php _e('Comment') ?></th>
<th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
<th scope="col" class="column-author"><?php _e('Author') ?></th>
<th scope="col" class="column-date"><?php _e('Submitted') ?></th>
</tr>

6
wp-admin/edit-form-comment.php
View File

@ -47,9 +47,9 @@ $url = attribute_escape( $comment->comment_author_url );
<div id="misc-publishing-actions">
<div class="misc-pub-section" id="comment-status-radio">
<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _e('Approved') ?></label><br />
<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _e('Pending') ?></label><br />
<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|verb'); ?></label>
<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php echo _c('Approved|adjective') ?></label><br />
<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php echo _c('Pending|adjective') ?></label><br />
<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|adjective'); ?></label>
</div>
<div class="misc-pub-section curtime misc-pub-section-last">

2
wp-admin/edit-pages.php
View File

@ -281,7 +281,7 @@ if ( 1 == count($posts) && is_singular() ) :
<table class="widefat" cellspacing="0">
<thead>
<tr>
<th scope="col" class="column-comment"><?php _e('Comment') ?></th>
<th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th>
<th scope="col" class="column-author"><?php _e('Author') ?></th>
<th scope="col" class="column-date"><?php _e('Submitted') ?></th>
</tr>

6
wp-admin/includes/template.php
View File

@ -677,7 +677,7 @@ function tag_rows( $page = 1, $pagesize = 20, $searchterms = '' ) {
function wp_manage_posts_columns() {
$posts_columns = array();
$posts_columns['cb'] = '<input type="checkbox" />';
$posts_columns['title'] = __('Post');
$posts_columns['title'] = _c('Post|noun');
$posts_columns['author'] = __('Author');
$posts_columns['categories'] = __('Categories');
$posts_columns['tags'] = __('Tags');
@ -764,7 +764,7 @@ function get_column_headers($page) {
case 'edit-comments':
$_wp_column_headers[$page] = array(
'cb' => '<input type="checkbox" />',
'comment' => __('Comment'),
'comment' => _c('Comment|noun'),
'author' => __('Author'),
'date' => __('Submitted'),
'response' => __('In Response To')
@ -1993,7 +1993,7 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true
}
}
if ( 'spam' != $the_comment_status )
$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>';
$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>';
$actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
$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>';

2
wp-content/themes/classic/comments-popup.php
View File

@ -49,7 +49,7 @@ if ( post_password_required($commentstatus) ) { // and it doesn't match the coo
<?php foreach ($comments as $comment) { ?>
<li id="comment-<?php comment_ID() ?>">
<?php comment_text() ?>
<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>
<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>
</li>
<?php } // end for each comment ?>

2
wp-content/themes/classic/comments.php
View File

@ -21,7 +21,7 @@ if ( post_password_required() ) : ?>
<li <?php comment_class(); ?> id="comment-<?php comment_ID() ?>">
<?php echo get_avatar( $comment, 32 ); ?>
<?php comment_text() ?>
<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>
<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>
</li>
<?php endforeach; ?>