diff --git a/src/wp-content/themes/twentyfourteen/inc/widgets.php b/src/wp-content/themes/twentyfourteen/inc/widgets.php
index dec749c952..a638a6caf2 100644
--- a/src/wp-content/themes/twentyfourteen/inc/widgets.php
+++ b/src/wp-content/themes/twentyfourteen/inc/widgets.php
@@ -23,16 +23,6 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
*/
private $formats = array( 'aside', 'image', 'video', 'audio', 'quote', 'link', 'gallery' );
- /**
- * Pluralized post format strings.
- *
- * @access private
- * @since Twenty Fourteen 1.0
- *
- * @var array
- */
- private $format_strings;
-
/**
* Constructor.
*
@@ -45,19 +35,6 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
'classname' => 'widget_twentyfourteen_ephemera',
'description' => __( 'Use this widget to list your recent Aside, Quote, Video, Audio, Image, Gallery, and Link posts.', 'twentyfourteen' ),
) );
-
- /*
- * @todo http://core.trac.wordpress.org/ticket/23257: Add plural versions of Post Format strings
- */
- $this->format_strings = array(
- 'aside' => __( 'Asides', 'twentyfourteen' ),
- 'image' => __( 'Images', 'twentyfourteen' ),
- 'video' => __( 'Videos', 'twentyfourteen' ),
- 'audio' => __( 'Audio', 'twentyfourteen' ),
- 'quote' => __( 'Quotes', 'twentyfourteen' ),
- 'link' => __( 'Links', 'twentyfourteen' ),
- 'gallery' => __( 'Galleries', 'twentyfourteen' ),
- );
}
/**
@@ -72,8 +49,41 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
*/
public function widget( $args, $instance ) {
$format = $instance['format'];
+
+ switch ( $format ) {
+ case 'image':
+ $format_string = __( 'Images', 'twentyfourteen' );
+ $format_string_more = __( 'More images', 'twentyfourteen' );
+ break;
+ case 'video':
+ $format_string = __( 'Videos', 'twentyfourteen' );
+ $format_string_more = __( 'More videos', 'twentyfourteen' );
+ break;
+ case 'audio':
+ $format_string = __( 'Audio', 'twentyfourteen' );
+ $format_string_more = __( 'More audio', 'twentyfourteen' );
+ break;
+ case 'quote':
+ $format_string = __( 'Quotes', 'twentyfourteen' );
+ $format_string_more = __( 'More quotes', 'twentyfourteen' );
+ break;
+ case 'link':
+ $format_string = __( 'Links', 'twentyfourteen' );
+ $format_string_more = __( 'More links', 'twentyfourteen' );
+ break;
+ case 'gallery':
+ $format_string = __( 'Galleries', 'twentyfourteen' );
+ $format_string_more = __( 'More galleries', 'twentyfourteen' );
+ break;
+ case 'aside':
+ default:
+ $format_string = __( 'Asides', 'twentyfourteen' );
+ $format_string_more = __( 'More asides', 'twentyfourteen' );
+ break;
+ }
+
$number = empty( $instance['number'] ) ? 2 : absint( $instance['number'] );
- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? $this->format_strings[ $format ] : $instance['title'], $instance, $this->id_base );
+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? $format_string : $instance['title'], $instance, $this->id_base );
$ephemera = new WP_Query( array(
'order' => 'DESC',
@@ -191,7 +201,12 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
- →', 'twentyfourteen' ), $this->format_strings[ $format ] ); ?>
+
+ →', 'twentyfourteen' ), $format_string_more );
+ ?>
+