Ticket #19257: 19257.diff

src/wp-admin/edit-form-advanced.php

@@ -208 +208 @@
         add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
 
 if ( $thumbnail_support && current_user_can( 'upload_files' ) )
-        add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low');
+        add_meta_box('postimagediv', $post_type_object->labels->featured_image, 'post_thumbnail_meta_box', null, 'side', 'low');
 
 if ( post_type_supports($post_type, 'excerpt') )
         add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core');
@@ -366 +366 @@
         }
 
         if ( current_theme_supports( 'post-thumbnails' ) && post_type_supports( 'post', 'thumbnail' ) ) {
-                $publish_box .= '<li>' . __('<strong>Featured Image</strong> - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the featured image as a post thumbnail on the home page, a custom header, etc.') . '</li>';
+                $publish_box .= '<li>' . sprintf( __('<strong>%s</strong> - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the featured image as a post thumbnail on the home page, a custom header, etc.'), $post_type_object->labels->featured_image ) . '</li>';
         }
 
         $publish_box .= '</ul>';

src/wp-admin/includes/media.php

@@ -1486 +1486 @@
         }
         if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
                 && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
+                
+                $calling_post = get_post( $calling_post_id );
+                $calling_post_type_object = get_post_type_object( $calling_post->post_type );
+
                 $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" );
-                $thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html__( "Use as featured image" ) . "</a>";
+                $thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html( $calling_post_type_object->labels->use_featured_image ) . "</a>";
         }
 
         if ( ( $r['send'] || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) {
@@ -1722 +1726 @@
  * @since 2.5.0
  */
 function media_upload_header() {
+
         $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
-        echo '<script type="text/javascript">post_id = ' . $post_id . ";</script>\n";
+
+        if ( ! empty( $post_id ) ) { 
+                $post_type = get_post_type( $post_id ); 
+        } else {
+                $post_type = ''; 
+        } 
+
+        echo '<script type="text/javascript">post_id = ' . $post_id . ';post_type = ' . $post_type . ';</script>';
         if ( empty( $_GET['chromeless'] ) ) {
                 echo '<div id="media-upload-header">';
                 the_media_upload_tabs();

src/wp-admin/includes/post.php

@@ -1345 +1345 @@
 function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
         global $content_width, $_wp_additional_image_sizes;
 
-        $post = get_post( $post );
-
+        $post = get_post( $post ); 
+        $post_type_object = get_post_type_object( $post->post_type ); 
+        $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr( $post_type_object->labels->set_featured_image ) . '" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>'; 
         $upload_iframe_src = esc_url( get_upload_iframe_src('image', $post->ID ) );
-        $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>';
-        $content = sprintf( $set_thumbnail_link, $upload_iframe_src, esc_html__( 'Set featured image' ) );
+
+        $content = sprintf( $set_thumbnail_link, $upload_iframe_src, esc_html( $post_type_object->labels->set_featured_image ) );
 
         if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
                 $old_content_width = $content_width;
@@ -1361 +1362 @@
                 if ( !empty( $thumbnail_html ) ) {
                         $ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID );
                         $content = sprintf( $set_thumbnail_link, $upload_iframe_src, $thumbnail_html );
-                        $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html__( 'Remove featured image' ) . '</a></p>';
+                        $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';
                 }
                 $content_width = $old_content_width;
         }

src/wp-admin/js/set-post-thumbnail.js

@@ -9 +9 @@
                 action: 'set-post-thumbnail', post_id: post_id, thumbnail_id: id, _ajax_nonce: nonce, cookie: encodeURIComponent( document.cookie )
         }, function(str){
                 var win = window.dialogArguments || opener || parent || top;
-                $link.text( setPostThumbnailL10n.setThumbnail );
+                setThumbnail = 'setThumbnail_' + post_type;
+                $link.text( setPostThumbnailL10n[setThumbnail] ); 
                 if ( str == '0' ) {
                         alert( setPostThumbnailL10n.error );
                 } else {

src/wp-includes/media.php

@@ -2991 +2991 @@
 
         $hier = $post && is_post_type_hierarchical( $post->post_type );
 
+        $post_type_object = get_post_type_object( $post->post_type );
+
         $strings = array(
                 // Generic
                 'url'         => __( 'URL' ),
@@ -3049 +3051 @@
                 'insertFromUrlTitle' => __( 'Insert from URL' ),
 
                 // Featured Images
-                'setFeaturedImageTitle' => __( 'Set Featured Image' ),
-                'setFeaturedImage'    => __( 'Set featured image' ),
+                'setFeaturedImageTitle' => $post_type_object->labels->featured_image,
+                'setFeaturedImage'      => $post_type_object->labels->set_featured_image,
 
                 // Gallery
                 'createGalleryTitle' => __( 'Create Gallery' ),

src/wp-includes/post.php

@@ -1615 +1615 @@
  * - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical
  *                       ones the default is 'Parent Page:'.
  * - all_items - String for the submenu. Default is All Posts/All Pages.
+ * - featured_image - Default is Featured Image.
+ * - set_featured_image - Default is Set featured Image.
+ * - remove_featured_image - Default is Remove featured Image.
+ * - use_featured_image - Default is Use as featured Image.
  * - menu_name - Default is the same as `name`.
  *
  * Above, the first default value is for non-hierarchical post types (like posts)
@@ -1639 +1643 @@
                 'not_found' => array( __('No posts found.'), __('No pages found.') ),
                 'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
                 'parent_item_colon' => array( null, __('Parent Page:') ),
-                'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) )
+                'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
+                'featured_image' => array( __( 'Featured Image' ), __( 'Featured Image' ) ),
+                'set_featured_image' => array( __( 'Set featured image' ), __( 'Set featured image' ) ),
+                'remove_featured_image' => array( __( 'Remove featured image' ), __( 'Remove featured image' ) ),
+                'use_featured_image' => array( __( 'Use as featured image' ), __( 'Use as featured image' ) ),
         );
         $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 

src/wp-includes/script-loader.php

@@ -570 +570 @@
                         'error' => __( 'Could not load the preview image. Please reload the page and try again.' )
                 ));
 
-                $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 );
-                did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
-                        'setThumbnail' => __( 'Use as featured image' ),
+                $setPostThumbnailL10n = array(
+                        'setThumbnail' => __( 'Use as featured image' ), // Back compat 
                         'saving' => __( 'Saving...' ),
                         'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
                         'done' => __( 'Done' )
-                ) );
+                ); 
+
+                foreach ( get_post_types( null, 'objects' ) as $post_type_object ) { 
+                        if ( isset( $post_type_object->labels->use_featured_image ) ) {
+                                $setPostThumbnailL10n["setThumbnail_{$post_type_object->name}"] = $post_type_object->labels->use_featured_image; 
+                        }
+                } 
+                $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 ); 
+                did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', $setPostThumbnailL10n ); 
+
 
                 // Navigation Menus
                 $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox' ) );

tests/phpunit/tests/post/types.php

@@ -101 +101 @@
                 update_option( 'permalink_structure', $old_permastruct );
                 _unregister_post_type( 'foo' );
         }
+
+        /**
+         * @ticket 19257
+         */
+        function test_post_type_featured_image_labels() {
+                
+                register_post_type( 'foo' );
+
+                $post_type_object = get_post_type_object( 'foo' );
+
+                $this->assertEquals( 'Featured Image', $post_type_object->labels->featured_image );
+                $this->assertEquals( 'Set featured image', $post_type_object->labels->set_featured_image );
+                $this->assertEquals( 'Use as featured image', $post_type_object->labels->use_featured_image );
+                $this->assertEquals( 'Remove featured image', $post_type_object->labels->remove_featured_image );
+
+                _unregister_post_type( 'foo' );
+
+                register_post_type( 'foo', array( 'labels' => array(
+                        'featured_image' => 'Cover Image', 
+                        'set_featured_image' => 'Set cover image', 
+                        'remove_featured_image' => 'Remove cover image', 
+                        'use_featured_image' => 'Use as cover image'
+                ) ) );
+
+                $post_type_object = get_post_type_object( 'foo' );
+
+                $this->assertEquals( 'Cover Image', $post_type_object->labels->featured_image );
+                $this->assertEquals( 'Set cover image', $post_type_object->labels->set_featured_image );
+                $this->assertEquals( 'Use as cover image', $post_type_object->labels->use_featured_image );
+                $this->assertEquals( 'Remove cover image', $post_type_object->labels->remove_featured_image );
+
+        }
 }