Changeset 32673

Timestamp:

05/31/2015 04:53:12 PM (9 years ago)

Author:

johnbillion

Message:

Introduce featured_image, set_featured_image, remove_featured_image, and use_featured_image post type labels when registering a post type in order to override the 'Featured Image' text and its related phrases.

Props johnbillion, mordauk, valendesigns.
Fixes #19257.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (2 diffs)
• wp-admin/js/set-post-thumbnail.js (modified) (1 diff)
• wp-includes/media.php (modified) (3 diffs)
• wp-includes/post.php (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -214 +214 @@
 
 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', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low');
 
 if ( post_type_supports($post_type, 'excerpt') )
@@ -372 +372 @@
 
     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>';
+        /* translators: %s: Featured Image */
+        $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 image as a post thumbnail on the home page, a custom header, etc.' ), esc_html( $post_type_object->labels->featured_image ) ) . '</li>';
     }
 

trunk/src/wp-admin/includes/media.php

@@ -1494 +1494 @@
     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>";
     }
 
@@ -1737 +1741 @@
  */
 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">';

trunk/src/wp-admin/includes/post.php

@@ -1363 +1363 @@
     global $content_width, $_wp_additional_image_sizes;
 
-    $post = get_post( $post );
-
-    $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' ) );
+    $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="%s" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>';
+    $upload_iframe_src  = get_upload_iframe_src( 'image', $post->ID );
+
+    $content = sprintf( $set_thumbnail_link,
+        esc_attr( $post_type_object->labels->set_featured_image ),
+        esc_url( $upload_iframe_src ),
+        esc_html( $post_type_object->labels->set_featured_image )
+    );
 
     if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
@@ -1378 +1383 @@
         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 = sprintf( $set_thumbnail_link,
+                esc_attr( $post_type_object->labels->set_featured_image ),
+                esc_url( $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( $post_type_object->labels->remove_featured_image ) . '</a></p>';
         }
         $content_width = $old_content_width;

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

@@ -10 +10 @@
     }, 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 );

trunk/src/wp-includes/media.php

@@ -2314 +2314 @@
 
     wp_embed_register_handler( 'youtube_embed_url', '#https?://(www.)?youtube\.com/embed/([^/]+)#i', 'wp_embed_handler_youtube' );
+    wp_embed_register_handler( 'youtube_v_url', '#https?://(www.)?youtube\.com/v/([^/]+)#i', 'wp_embed_handler_youtube' );
 
     wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' );
@@ -3009 +3010 @@
     $hier = $post && is_post_type_hierarchical( $post->post_type );
 
+    $post_type_object = get_post_type_object( $post->post_type );
+
     $strings = array(
         // Generic
@@ -3067 +3070 @@
 
         // 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

trunk/src/wp-includes/post.php

@@ -1625 +1625 @@
  *                       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`.
  *
@@ -1631 +1635 @@
  *
  * @since 3.0.0
+ * @since 4.3.0 Added the `featured_image`, `set_featured_image`, `remove_featured_image`, and `use_featured_image` labels.
  * @access private
  *
@@ -1649 +1654 @@
         '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'];

trunk/src/wp-includes/script-loader.php

@@ -571 +571 @@
         ));
 
-        $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