Ticket #26526: 26526.4.diff

src/wp-content/themes/twentyfourteen/inc/customizer.php

@@ -33 +33 @@
         // Add the featured content section in case it's not already there.
         $wp_customize->add_section( 'featured_content', array(
                 'title'       => __( 'Featured Content', 'twentyfourteen' ),
-                'description' => sprintf( __( 'Use a <a href="%1$s">tag</a> to feature your posts. If no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ), admin_url( '/edit.php?tag=featured' ), admin_url( '/edit.php?show_sticky=1' ) ),
+                'description' => sprintf( __( 'Use a <a href="%1$s">tag</a> to feature your posts. If no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ),
+                        esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ),
+                        admin_url( 'edit.php?show_sticky=1' )
+                ),
                 'priority'    => 130,
         ) );
 
@@ -98 +101 @@
                 'title'   => __( 'Twenty Fourteen', 'twentyfourteen' ),
                 'content' =>
                         '<ul>' .
-                                '<li>' . sprintf( __( 'The home page features your choice of up to 6 posts prominently displayed in a grid or slider, controlled by the <a href="%1$s">featured</a> tag; you can change the tag and layout in <a href="%2$s">Appearance &rarr; Customize</a>. If no posts match the tag, <a href="%3$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ), admin_url( '/edit.php?tag=featured' ), admin_url( 'customize.php' ), admin_url( '/edit.php?show_sticky=1' ) ) . '</li>' .
+                                '<li>' . sprintf( __( 'The home page features your choice of up to 6 posts prominently displayed in a grid or slider, controlled a <a href="%1$s">tag</a>; you can change the tag and layout in <a href="%2$s">Appearance &rarr; Customize</a>. If no posts match the tag, <a href="%3$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ), esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ), admin_url( 'customize.php' ), admin_url( 'edit.php?show_sticky=1' ) ) . '</li>' .
                                 '<li>' . sprintf( __( 'Enhance your site design by using <a href="%s">Featured Images</a> for posts you&rsquo;d like to stand out (also known as post thumbnails). This allows you to associate an image with your post without inserting it. Twenty Fourteen uses featured images for posts and pages&mdash;above the title&mdash;and in the Featured Content area on the home page.', 'twentyfourteen' ), 'http://codex.wordpress.org/Post_Thumbnails#Setting_a_Post_Thumbnail' ) . '</li>' .
                                 '<li>' . sprintf( __( 'For an in-depth tutorial, and more tips and tricks, visit the <a href="%s">Twenty Fourteen documentation</a>.', 'twentyfourteen' ), 'http://codex.wordpress.org/Twenty_Fourteen' ) . '</li>' .
                         '</ul>',

src/wp-content/themes/twentyfourteen/inc/featured-content.php

@@ -159 +159 @@
                 $settings = self::get_setting();
 
                 // Return sticky post ids if no tag name is set.
-                $term = get_term_by( 'name', $settings['tag-name'], 'post_tag' );
+                $term = get_term_by( 'slug', $settings['tag-name'], 'post_tag' );
                 if ( $term ) {
                         $tag = $term->term_id;
                 } else {
@@ -406 +406 @@
         public static function customize_register( $wp_customize ) {
                 $wp_customize->add_section( 'featured_content', array(
                         'title'          => __( 'Featured Content', 'twentyfourteen' ),
-                        'description'    => sprintf( __( 'Use the <a href="%1$s">"featured" tag</a> to feature your posts. You can change this to a tag of your choice; if no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ), admin_url( '/edit.php?tag=featured' ), admin_url( '/edit.php?show_sticky=1' ) ),
+                        'description'    => sprintf( __( 'Use a <a href="%1$s">tag</a> to feature your posts. You can change this to a tag of your choice; if no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ),
+                                esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ),
+                                admin_url( 'edit.php?show_sticky=1' )
+                        ),
                         'priority'       => 130,
                         'theme_supports' => 'featured-content',
                 ) );
 
                 // Add Featured Content settings.
                 $wp_customize->add_setting( 'featured-content[tag-name]', array(
-                        'default'              => 'featured',
+                        'default'              => _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ),
                         'type'                 => 'option',
                         'sanitize_js_callback' => array( __CLASS__, 'delete_transient' ),
                 ) );
@@ -474 +477 @@
                         'hide-tag' => 1,
                         'quantity' => 6,
                         'tag-id'   => 0,
-                        'tag-name' => 'featured',
+                        'tag-name' => _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ),
                 );
 
                 $options = wp_parse_args( $saved, $defaults );
@@ -508 +511 @@
                 if ( empty( $input['tag-name'] ) ) {
                         $output['tag-id'] = 0;
                 } else {
-                        $term = get_term_by( 'name', $input['tag-name'], 'post_tag' );
+                        $term = get_term_by( 'slug', $input['tag-name'], 'post_tag' );
 
                         if ( $term ) {
                                 $output['tag-id'] = $term->term_id;