Changeset 22735

Timestamp:

11/20/2012 11:22:03 PM (12 years ago)

Author:

nacin

Message:

Media: For pages, use 'Insert into page' rather than 'Insert into post'.

Custom post types can use the media_view_strings filter. No new post type "labels" for now.

see #22712. see #21092 (and #19696).

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-includes/media.php (modified) (2 diffs)

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

@@ -15 +15 @@
 if ( wp_is_mobile() )
     wp_enqueue_script( 'jquery-touch-punch' );
-
-if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) {
-    add_thickbox();
-    wp_enqueue_media();
-}
 
 /**
@@ -29 +24 @@
 $user_ID = isset($user_ID) ? (int) $user_ID : 0;
 $action = isset($action) ? $action : '';
+
+if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) {
+    add_thickbox();
+    wp_enqueue_media( array( 'post' => $post_id ) );
+}
 
 $messages = array();

trunk/wp-includes/media.php

@@ -1335 +1335 @@
     }
 
+    $hier = $post && is_post_type_hierarchical( $post->post_type );
+
     $strings = array(
         // Generic
@@ -1355 +1357 @@
         'mediaLibraryTitle' => __( 'Media Library' ),
         'createNewGallery'  => __( 'Create a new gallery' ),
-        'insertIntoPost'    => __( 'Insert into post' ),
+        'insertIntoPost'    =>  $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
         'returnToLibrary'   => __( '← Return to library' ),
 
         'allMediaItems'      => __( 'All media items' ),
-        'uploadedToThisPost' => __( 'Uploaded to this post' ),
+        'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
         'images'             => __( 'Images' ),
         'audio'              => __( 'Audio' ),