Ticket #18885: 18885.diff

wp-admin/includes/dashboard.php

@@ -670 +670 @@
         $comment_post_url = get_edit_post_link( $comment->comment_post_ID );
         $comment_post_title = strip_tags(get_the_title( $comment->comment_post_ID ));
         $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
-        $comment_link = '<a class="comment-link" href="' . esc_url(get_comment_link()) . '">#</a>';
+        $comment_sep = '|';
+        $comment_link = '<a class="comment-link" href="' . esc_url( get_comment_link() ) . '">' . _x( 'View Comment', 'dashboard' ) . '</a>';
 
         $actions_string = '';
         if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
@@ -726 +727 @@
 
                         <div class="dashboard-comment-wrap">
                         <h4 class="comment-meta">
-                                <?php printf( /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__( 'From %1$s on %2$s%3$s' ),
-                                        '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
+                                <?php printf( /* translators: 1: comment author, 2: post link, 3: separator (|), 4: comment link, 5: notification if the comment is pending */ __( 'From %1$s on %2$s %3$s %4$s' ),
+                                        '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link, $comment_sep, $comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
                         </h4>
 
                         <?php
@@ -745 +746 @@
                                 $type = esc_html( $type );
                         ?>
                         <div class="dashboard-comment-wrap">
-                        <?php /* translators: %1$s is type of comment, %2$s is link to the post */ ?>
-                        <h4 class="comment-meta"><?php printf( _x( '%1$s on %2$s', 'dashboard' ), "<strong>$type</strong>", $comment_post_link." ".$comment_link ); ?></h4>
+                        <?php /* translators: 1: comment type, 2: post link, 3: separator (|), 4: comment link */ ?>
+                        <h4 class="comment-meta"><?php printf( __( '%1$s on %2$s %3$s %4$s' ), "<strong>$type</strong>", $comment_post_link, $comment_sep, $comment_link ); ?></h4>
                         <p class="comment-author"><?php comment_author_link(); ?></p>
 
                         <?php endif; // comment_type ?>
@@ -1268 +1269 @@
         ?>
         <div class="welcome-panel">
                 <h3><?php _e( 'Welcome to WordPress!' ); ?></h3>
-                
+
                 <a class="welcome-panel-close" href="#"><?php _e('Close'); ?></a>
-                
+
                 <?php
                 // For now, we'll just approximate capabilities for each role.
                 ?>
-                
+
                 <?php if ( current_user_can('switch_themes') ): ?>
                         <p>[admin placeholder]</p>
                 <?php elseif ( current_user_can('edit_others_posts') ): ?>