Changeset 27589

Timestamp:

03/18/2014 06:49:03 PM (11 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: improve i18n in Ephemera widget for better translation of plurals for post format archives. Fixes #27069, props Chouby, SergeyBiryukov, lancewillett.

File:

• trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php (modified) (4 diffs)

trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php

@@ -25 +25 @@
 
     /**
-     * Pluralized post format strings.
-     *
-     * @access private
-     * @since Twenty Fourteen 1.0
-     *
-     * @var array
-     */
-    private $format_strings;
-
-    /**
      * Constructor.
      *
@@ -46 +36 @@
             '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' ),
-        );
     }
 
@@ -73 +50 @@
     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(
@@ -192 +202 @@
 
             </ol>
-            <a class="post-format-archive-link" href="<?php echo esc_url( get_post_format_link( $format ) ); ?>"><?php printf( __( 'More %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ), $this->format_strings[ $format ] ); ?></a>
+            <a class="post-format-archive-link" href="<?php echo esc_url( get_post_format_link( $format ) ); ?>">
+                <?php
+                    /* translators: used with More archives link */
+                    printf( __( '%s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ), $format_string_more );
+                ?>
+            </a>
             <?php