From 4f08e9d383833aefaa55a3614325bedd27ec2049 Mon Sep 17 00:00:00 2001
From: Aaron Jorbin <aaron@jorb.in>
Date: Mon, 9 Feb 2015 19:27:28 +0000
Subject: [PATCH] Use screen reader text instead of a title attribute in
 comments_popup_link

To better understand screen reader text, check out https://make.wordpress.org/accessibility/2015/02/09/hiding-text-for-screen-readers-with-wordpress-core/

Screen Reader text improves the user experience for screen reader users. It provides additional context for links, document forms and other pieces of a page that may exist visually, but are lost when looking only at the html of a site.  This does change the output of comments_popup_link if you don't pass in values for $zero, $one, $more or $none. Theme authors can and should style <code>.screen-reader-text</code> in ways that are recommended in the above article to hide it visually.

Props joedolson
Fixes #26553




Built from https://develop.svn.wordpress.org/trunk@31388


git-svn-id: http://core.svn.wordpress.org/trunk@31369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment-template.php | 18 ++++++++++--------
 wp-includes/version.php          |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 1c54a45310..7e4f5a797d 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1274,13 +1274,16 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 	global $wpcommentspopupfile, $wpcommentsjavascript;
 
 	$id = get_the_ID();
-
-	if ( false === $zero ) $zero = __( 'No Comments' );
-	if ( false === $one ) $one = __( '1 Comment' );
-	if ( false === $more ) $more = __( '% Comments' );
-	if ( false === $none ) $none = __( 'Comments Off' );
-
+	$span = '<span class="screen-reader-text">';
+	$title = get_the_title();
+	$span_close = '</span>';
+	
 	$number = get_comments_number( $id );
+	
+	if ( false === $zero ) $zero = sprintf( __( 'No Comments%1$s on %2$s%3$s' ), $span, $title, $span_close );
+	if ( false === $one ) $one = sprintf( __( '1 Comment%1$s on %2$s%3$s' ), $span, $title, $span_close );
+	if ( false === $more ) $more = sprintf( __( '%4$d Comments%1$s on %2$s%3$s' ), $span, $title, $span_close, $number );
+	if ( false === $none ) $none = sprintf( __( 'Comments Off%1$s on %2$s%3$s' ), $span, $title, $span_close );
 
 	if ( 0 == $number && !comments_open() && !pings_open() ) {
 		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
@@ -1311,7 +1314,6 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 	if ( !empty( $css_class ) ) {
 		echo ' class="'.$css_class.'" ';
 	}
-	$title = the_title_attribute( array('echo' => 0 ) );
 
 	$attributes = '';
 	/**
@@ -1323,7 +1325,7 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 	 */
 	echo apply_filters( 'comments_popup_link_attributes', $attributes );
 
-	echo ' title="' . esc_attr( sprintf( __('Comment on %s'), $title ) ) . '">';
+	echo '>';
 	comments_number( $zero, $one, $more );
 	echo '</a>';
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index eb9eedef1b..bda7751038 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31387';
+$wp_version = '4.2-alpha-31388';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.