From bbdafdc925e70ed2168a690d7974223db68c7140 Mon Sep 17 00:00:00 2001
From: Lance Willett <nanobar@gmail.com>
Date: Wed, 19 Nov 2014 18:35:21 +0000
Subject: [PATCH] Twenty Thirteen: replace ellipses appended to automatically
 generated excerpts with both ellipses and a "Continue Reading" link to meet
 accessibility-ready requirements.

Props davidakennedy, lancewillett. Fixes #30178.
Built from https://develop.svn.wordpress.org/trunk@30390


git-svn-id: http://core.svn.wordpress.org/trunk@30387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentythirteen/content-aside.php   | 11 ++++++++--
 .../themes/twentythirteen/content-audio.php   | 11 ++++++++--
 .../themes/twentythirteen/content-chat.php    | 11 ++++++++--
 .../themes/twentythirteen/content-gallery.php | 11 ++++++++--
 .../themes/twentythirteen/content-image.php   | 11 ++++++++--
 .../themes/twentythirteen/content-link.php    | 11 ++++++++--
 .../themes/twentythirteen/content-quote.php   | 11 ++++++++--
 .../themes/twentythirteen/content-status.php  | 11 ++++++++--
 .../themes/twentythirteen/content-video.php   | 11 ++++++++--
 wp-content/themes/twentythirteen/content.php  | 11 ++++++++--
 .../themes/twentythirteen/functions.php       | 21 +++++++++++++++++++
 11 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/wp-content/themes/twentythirteen/content-aside.php b/wp-content/themes/twentythirteen/content-aside.php
index 8aa309b530..373dde79e2 100644
--- a/wp-content/themes/twentythirteen/content-aside.php
+++ b/wp-content/themes/twentythirteen/content-aside.php
@@ -10,8 +10,15 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+		<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-audio.php b/wp-content/themes/twentythirteen/content-audio.php
index 5ba1862e52..c36676464d 100644
--- a/wp-content/themes/twentythirteen/content-audio.php
+++ b/wp-content/themes/twentythirteen/content-audio.php
@@ -21,8 +21,15 @@
 
 	<div class="entry-content">
 		<div class="audio-content">
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+			<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 		</div><!-- .audio-content -->
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-chat.php b/wp-content/themes/twentythirteen/content-chat.php
index b34ab46f13..3df4d29496 100644
--- a/wp-content/themes/twentythirteen/content-chat.php
+++ b/wp-content/themes/twentythirteen/content-chat.php
@@ -20,8 +20,15 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+		<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-gallery.php b/wp-content/themes/twentythirteen/content-gallery.php
index a4e246468b..1442959fda 100644
--- a/wp-content/themes/twentythirteen/content-gallery.php
+++ b/wp-content/themes/twentythirteen/content-gallery.php
@@ -21,8 +21,15 @@
 
 	<div class="entry-content">
 		<?php if ( is_single() || ! get_post_gallery() ) : ?>
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+			<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 		<?php else : ?>
 			<?php echo get_post_gallery(); ?>
 		<?php endif; // is_single() ?>
diff --git a/wp-content/themes/twentythirteen/content-image.php b/wp-content/themes/twentythirteen/content-image.php
index 972423ddaa..b28f9f7644 100644
--- a/wp-content/themes/twentythirteen/content-image.php
+++ b/wp-content/themes/twentythirteen/content-image.php
@@ -20,8 +20,15 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+		<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-link.php b/wp-content/themes/twentythirteen/content-link.php
index 2da7ffbfdb..e78bb3222f 100644
--- a/wp-content/themes/twentythirteen/content-link.php
+++ b/wp-content/themes/twentythirteen/content-link.php
@@ -21,8 +21,15 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+		<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 	</div><!-- .entry-content -->
 
 	<?php if ( is_single() ) : ?>
diff --git a/wp-content/themes/twentythirteen/content-quote.php b/wp-content/themes/twentythirteen/content-quote.php
index 307537d221..a0d77fe303 100644
--- a/wp-content/themes/twentythirteen/content-quote.php
+++ b/wp-content/themes/twentythirteen/content-quote.php
@@ -10,8 +10,15 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+		<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-status.php b/wp-content/themes/twentythirteen/content-status.php
index 272f5de80a..8b7f7d4b35 100644
--- a/wp-content/themes/twentythirteen/content-status.php
+++ b/wp-content/themes/twentythirteen/content-status.php
@@ -10,8 +10,15 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+		<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-video.php b/wp-content/themes/twentythirteen/content-video.php
index ac017588fe..e74058d3bc 100644
--- a/wp-content/themes/twentythirteen/content-video.php
+++ b/wp-content/themes/twentythirteen/content-video.php
@@ -20,8 +20,15 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+		<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content.php b/wp-content/themes/twentythirteen/content.php
index c341740438..447b7cde9b 100644
--- a/wp-content/themes/twentythirteen/content.php
+++ b/wp-content/themes/twentythirteen/content.php
@@ -38,8 +38,15 @@
 	</div><!-- .entry-summary -->
 	<?php else : ?>
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+		<?php
+			/* translators: %s: Name of current post */
+			the_content( sprintf(
+				esc_html__( 'Continue reading %s', 'twentythirteen' ),
+				the_title( '<span class="screen-reader-text">', '</span> <span class="meta-nav">&rarr;</span>', false )
+			) );
+
+			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+		?>
 	</div><!-- .entry-content -->
 	<?php endif; ?>
 
diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
index 5474d07d3a..043be440a1 100644
--- a/wp-content/themes/twentythirteen/functions.php
+++ b/wp-content/themes/twentythirteen/functions.php
@@ -461,6 +461,27 @@ function twentythirteen_get_link_url() {
 	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
 }
 
+if ( ! function_exists( 'twentythirteen_excerpt_more' ) && ! is_admin() ) :
+/**
+ * Replaces "[...]" (appended to automatically generated excerpts) with ...
+ * and a Continue reading link.
+ *
+ * @since Twenty Thirteen 1.4
+ *
+ * @param string $more Default Read More excerpt link.
+ * @return string Filtered Read More excerpt link.
+ */
+function twentythirteen_excerpt_more( $more ) {
+	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
+		esc_url( get_permalink( get_the_ID() ) ),
+			/* translators: %s: Name of current post */
+			sprintf( esc_html__( 'Continue reading %s', 'twentythirteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span> <span class="meta-nav">&rarr;</span>' )
+		);
+	return ' &hellip; ' . $link;
+}
+add_filter( 'excerpt_more', 'twentythirteen_excerpt_more' );
+endif;
+
 /**
  * Extend the default WordPress body classes.
  *