Changeset 9835

Timestamp:

11/21/2008 06:16:44 PM (18 years ago)

Author:

westi

Message:

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

Location:

trunk

Files:

• wp-admin/comment.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-form-comment.php (modified) (1 diff)
• wp-admin/edit-pages.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (3 diffs)
• wp-content/themes/classic/comments-popup.php (modified) (1 diff)
• wp-content/themes/classic/comments.php (modified) (1 diff)

trunk/wp-admin/comment.php

@@ -124 +124 @@
 <?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>

trunk/wp-admin/edit-form-advanced.php

@@ -426 +426 @@
 <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>

trunk/wp-admin/edit-form-comment.php

@@ -48 +48 @@
 
 <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>
 

trunk/wp-admin/edit-pages.php

@@ -282 +282 @@
 <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>

trunk/wp-admin/includes/template.php

@@ -678 +678 @@
         $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');
@@ -765 +765 @@
                         $_wp_column_headers[$page] = array(
                                 'cb' => '<input type="checkbox" />',
-                                'comment' => __('Comment'),
+                                'comment' => _c('Comment|noun'),
                                 'author' => __('Author'),
                                 'date' => __('Submitted'),
@@ -1994 +1994 @@
                                         }
                                         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>';

trunk/wp-content/themes/classic/comments-popup.php

@@ -50 +50 @@
         <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>
 

trunk/wp-content/themes/classic/comments.php

@@ -22 +22 @@
         <?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>