Ticket #35095: 35095.diff

wp-admin/edit-form-advanced.php

@@ -83 +83 @@
 $messages = array();
 
 $preview_post_link_html = $scheduled_post_link_html = $view_post_link_html = '';
-$preview_page_link_html = $scheduled_page_link_html = $view_page_link_html = '';
 
 $preview_url = get_preview_post_link( $post );
 
@@ -94 +93 @@
         // Preview post link.
         $preview_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
                 esc_url( $preview_url ),
-                __( 'Preview post' )
+                __( 'Preview ' . lcfirst( $post_type_object->labels->singular_name ) )
         );
 
         // Scheduled post preview link.
         $scheduled_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
                 esc_url( $permalink ),
-                __( 'Preview post' )
+                __( 'Preview ' . lcfirst( $post_type_object->labels->singular_name ) )
         );
 
         // View post link.
         $view_post_link_html = sprintf( ' <a href="%1$s">%2$s</a>',
                 esc_url( $permalink ),
-                __( 'View post' )
+                __( 'View ' . lcfirst( $post_type_object->labels->singular_name ) )
         );
 
-        // Preview page link.
-        $preview_page_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
-                esc_url( $preview_url ),
-                __( 'Preview page' )
-        );
-
-        // Scheduled page preview link.
-        $scheduled_page_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
-                esc_url( $permalink ),
-                __( 'Preview page' )
-        );
-
-        // View page link.
-        $view_page_link_html = sprintf( ' <a href="%1$s">%2$s</a>',
-                esc_url( $permalink ),
-                __( 'View page' )
-        );
-
 }
 
 /* translators: Publish box date format, see http://php.net/date */
 $scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );
 
-$messages['post'] = array(
+$messages[ lcfirst( $post_type_object->labels->singular_name ) ] = array(
          0 => '', // Unused. Messages start at index 1.
-         1 => __( 'Post updated.' ) . $view_post_link_html,
+         1 => __( $post_type_object->labels->singular_name . ' updated.' ) . $view_post_link_html,
          2 => __( 'Custom field updated.' ),
          3 => __( 'Custom field deleted.' ),
-         4 => __( 'Post updated.' ),
+         4 => __( $post_type_object->labels->singular_name . ' updated.' ),
         /* translators: %s: date and time of the revision */
-         5 => isset($_GET['revision']) ? sprintf( __( 'Post restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-         6 => __( 'Post published.' ) . $view_post_link_html,
-         7 => __( 'Post saved.' ),
-         8 => __( 'Post submitted.' ) . $preview_post_link_html,
-         9 => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
-        10 => __( 'Post draft updated.' ) . $preview_post_link_html,
+         5 => isset($_GET['revision']) ? sprintf( __( $post_type_object->labels->singular_name . ' restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+         6 => __( $post_type_object->labels->singular_name . ' published.' ) . $view_post_link_html,
+         7 => __( $post_type_object->labels->singular_name . ' saved.' ),
+         8 => __( $post_type_object->labels->singular_name . ' submitted.' ) . $preview_post_link_html,
+         9 => sprintf( __( $post_type_object->labels->singular_name . ' scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
+        10 => __( $post_type_object->labels->singular_name . ' draft updated.' ) . $preview_post_link_html,
 );
-$messages['page'] = array(
-         0 => '', // Unused. Messages start at index 1.
-         1 => __( 'Page updated.' ) . $view_page_link_html,
-         2 => __( 'Custom field updated.' ),
-         3 => __( 'Custom field deleted.' ),
-         4 => __( 'Page updated.' ),
-        /* translators: %s: date and time of the revision */
-         5 => isset($_GET['revision']) ? sprintf( __( 'Page restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-         6 => __( 'Page published.' ) . $view_page_link_html,
-         7 => __( 'Page saved.' ),
-         8 => __( 'Page submitted.' ) . $preview_page_link_html,
-         9 => sprintf( __( 'Page scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_page_link_html,
-        10 => __( 'Page draft updated.' ) . $preview_page_link_html,
-);
 $messages['attachment'] = array_fill( 1, 10, __( 'Media attachment updated.' ) ); // Hack, for now.
 
 /**
@@ -176 +143 @@
         $_GET['message'] = absint( $_GET['message'] );
         if ( isset($messages[$post_type][$_GET['message']]) )
                 $message = $messages[$post_type][$_GET['message']];
-        elseif ( !isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]) )
-                $message = $messages['post'][$_GET['message']];
 }
 
 $notice = false;
@@ -429 +394 @@
 if ( 'post' == $post_type ) {
         $publish_box = '<p>' . __('Several boxes on this screen contain settings for how your content will be published, including:') . '</p>';
         $publish_box .= '<ul><li>' .
-                __( '<strong>Publish</strong> &mdash; You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). The Password protected option allows you to set an arbitrary password for each post. The Private option hides the post from everyone except editors and administrators. Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.' ) .
+                __( '<strong>Publish</strong> &mdash; You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post. The Password protected option allows you to set an arbitrary password for each post. The Private option hides the post from everyone except editors and administrators.' ) .
         '</li>';
 
         if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) {