From 64fb3e7175dcf8fd9f0ce43517b2c601f0529994 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 9 Dec 2014 18:57:24 +0000 Subject: [PATCH] In Twenty Fourteen, move the "Continue Reading" arrows back inside the translatable strings so they can be localised. See #30641 Built from https://develop.svn.wordpress.org/trunk@30796 git-svn-id: http://core.svn.wordpress.org/trunk@30786 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyfourteen/content-aside.php | 4 ++-- wp-content/themes/twentyfourteen/content-audio.php | 4 ++-- wp-content/themes/twentyfourteen/content-gallery.php | 4 ++-- wp-content/themes/twentyfourteen/content-image.php | 4 ++-- wp-content/themes/twentyfourteen/content-link.php | 4 ++-- wp-content/themes/twentyfourteen/content-quote.php | 4 ++-- wp-content/themes/twentyfourteen/content-video.php | 4 ++-- wp-content/themes/twentyfourteen/content.php | 4 ++-- wp-content/themes/twentyfourteen/inc/template-tags.php | 2 +- wp-includes/version.php | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/wp-content/themes/twentyfourteen/content-aside.php b/wp-content/themes/twentyfourteen/content-aside.php index 5dcaeeb068..0401579df0 100644 --- a/wp-content/themes/twentyfourteen/content-aside.php +++ b/wp-content/themes/twentyfourteen/content-aside.php @@ -45,8 +45,8 @@ ', ' →', false ) + __( 'Continue reading %s →', 'twentyfourteen' ), + the_title( '', '', false ) ) ); wp_link_pages( array( diff --git a/wp-content/themes/twentyfourteen/content-audio.php b/wp-content/themes/twentyfourteen/content-audio.php index 12a35c72e9..9fa9df41d4 100644 --- a/wp-content/themes/twentyfourteen/content-audio.php +++ b/wp-content/themes/twentyfourteen/content-audio.php @@ -45,8 +45,8 @@ ', ' →', false ) + __( 'Continue reading %s →', 'twentyfourteen' ), + the_title( '', '', false ) ) ); wp_link_pages( array( diff --git a/wp-content/themes/twentyfourteen/content-gallery.php b/wp-content/themes/twentyfourteen/content-gallery.php index 15c119921f..6e3fe83249 100644 --- a/wp-content/themes/twentyfourteen/content-gallery.php +++ b/wp-content/themes/twentyfourteen/content-gallery.php @@ -45,8 +45,8 @@ ', ' →', false ) + __( 'Continue reading %s →', 'twentyfourteen' ), + the_title( '', '', false ) ) ); wp_link_pages( array( diff --git a/wp-content/themes/twentyfourteen/content-image.php b/wp-content/themes/twentyfourteen/content-image.php index 2ea52ecfc6..a81e493d06 100644 --- a/wp-content/themes/twentyfourteen/content-image.php +++ b/wp-content/themes/twentyfourteen/content-image.php @@ -45,8 +45,8 @@ ', ' →', false ) + __( 'Continue reading %s →', 'twentyfourteen' ), + the_title( '', '', false ) ) ); wp_link_pages( array( diff --git a/wp-content/themes/twentyfourteen/content-link.php b/wp-content/themes/twentyfourteen/content-link.php index 8700f2b07e..858301efc1 100644 --- a/wp-content/themes/twentyfourteen/content-link.php +++ b/wp-content/themes/twentyfourteen/content-link.php @@ -45,8 +45,8 @@ ', ' →', false ) + __( 'Continue reading %s →', 'twentyfourteen' ), + the_title( '', '', false ) ) ); wp_link_pages( array( diff --git a/wp-content/themes/twentyfourteen/content-quote.php b/wp-content/themes/twentyfourteen/content-quote.php index 6699695b08..10a5d1122b 100644 --- a/wp-content/themes/twentyfourteen/content-quote.php +++ b/wp-content/themes/twentyfourteen/content-quote.php @@ -45,8 +45,8 @@ ', ' →', false ) + __( 'Continue reading %s →', 'twentyfourteen' ), + the_title( '', '', false ) ) ); wp_link_pages( array( diff --git a/wp-content/themes/twentyfourteen/content-video.php b/wp-content/themes/twentyfourteen/content-video.php index b10b69b665..4c49aaa145 100644 --- a/wp-content/themes/twentyfourteen/content-video.php +++ b/wp-content/themes/twentyfourteen/content-video.php @@ -45,8 +45,8 @@ ', ' →', false ) + __( 'Continue reading %s →', 'twentyfourteen' ), + the_title( '', '', false ) ) ); wp_link_pages( array( diff --git a/wp-content/themes/twentyfourteen/content.php b/wp-content/themes/twentyfourteen/content.php index 8a3842144e..e571d8b38a 100644 --- a/wp-content/themes/twentyfourteen/content.php +++ b/wp-content/themes/twentyfourteen/content.php @@ -53,8 +53,8 @@ ', ' →', false ) + __( 'Continue reading %s →', 'twentyfourteen' ), + the_title( '', '', false ) ) ); wp_link_pages( array( diff --git a/wp-content/themes/twentyfourteen/inc/template-tags.php b/wp-content/themes/twentyfourteen/inc/template-tags.php index 8f171f19ec..084f97ae1f 100644 --- a/wp-content/themes/twentyfourteen/inc/template-tags.php +++ b/wp-content/themes/twentyfourteen/inc/template-tags.php @@ -216,7 +216,7 @@ function twentyfourteen_excerpt_more( $more ) { $link = sprintf( '%2$s', esc_url( get_permalink( get_the_ID() ) ), /* translators: %s: Name of current post */ - sprintf( esc_html__( 'Continue reading %s', 'twentyfourteen' ), '' . get_the_title( get_the_ID() ) . ' →' ) + sprintf( __( 'Continue reading %s →', 'twentyfourteen' ), '' . get_the_title( get_the_ID() ) . '' ) ); return ' … ' . $link; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 4582242263..583650352c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30795'; +$wp_version = '4.1-beta2-30796'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.