Changeset 33436

Timestamp:

07/26/2015 11:35:47 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Comment string tweaks:

• Merge two strings about an invalid comment ID.
• Add missing context to 'Mark as Spam' string.
• Merge two 'In Response To' strings, replace redundant context with a translator comment.

props pavelevap.
fixes #32334.

Location:

trunk/src/wp-admin

Files:

• comment.php (modified) (4 diffs)
• edit-comments.php (modified) (1 diff)
• includes/class-wp-comments-list-table.php (modified) (1 diff)

trunk/src/wp-admin/comment.php

@@ -70 +70 @@
 
     if ( !$comment = get_comment( $comment_id ) )
-        comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+        comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
 
     if ( !current_user_can( 'edit_comment', $comment_id ) )
@@ -124 +124 @@
     case 'spam' :
         $caution_msg = __('You are about to mark the following comment as spam:');
-        $button      = __('Mark as Spam');
+        $button      = _x( 'Mark as Spam', 'comment' );
         break;
     case 'trash' :
@@ -178 +178 @@
 <?php } ?>
 <tr>
-    <th scope="row"><?php _e( 'In Response To' ); ?></th>
+    <th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
     <td>
     <?php
@@ -253 +253 @@
 
     if ( !$comment = get_comment($comment_id) )
-        comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+        comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
     if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
         comment_footer_die( __('You are not allowed to edit comments on this post.') );

trunk/src/wp-admin/edit-comments.php

@@ -162 +162 @@
     switch ( $error ) {
         case 1 :
-            $error_msg = __( 'Oops, no comment with this ID.' );
+            $error_msg = __( 'Invalid comment ID.' );
             break;
         case 2 :

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -358 +358 @@
         $columns['comment'] = _x( 'Comment', 'column name' );
 
-        if ( !$post_id )
-            $columns['response'] = _x( 'In Response To', 'column name' );
+        if ( ! $post_id ) {
+            /* translators: column name or table row header */
+            $columns['response'] = __( 'In Response To' );
+        }
 
         return $columns;