diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 73a252d39..7cce1f941 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -27,6 +27,8 @@ $messages[4] = __('Post updated.');
$messages[6] = sprintf(__('Post published. View post'), get_permalink($post_ID));
$messages[7] = __('Post saved.');
$messages[8] = sprintf(__('Post submitted. Preview post'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
+// translators: Publish box date formt, see http://php.net/date - Same as in meta-boxes.php
+$messages[9] = sprintf(__('Post scheduled for: %1$s. Preview post'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID));
if ( isset($_GET['revision']) )
$messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 65a312316..b4d1b7db8 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -27,6 +27,8 @@ $messages[2] = __('Custom field updated.');
$messages[3] = __('Custom field deleted.');
$messages[5] = sprintf(__('Page published. View page'), get_permalink($post_ID));
$messages[6] = sprintf(__('Page submitted. Preview page'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );
+// translators: Publish box date formt, see http://php.net/date - Same as in meta-boxes.php
+$messages[7] = sprintf(__('Page scheduled for: %1$s. Preview post'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID));
if ( isset($_GET['revision']) )
$messages[5] = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
diff --git a/wp-admin/page.php b/wp-admin/page.php
index 61bfe1e57..fcb7bd205 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -37,10 +37,16 @@ function redirect_page($page_ID) {
$location = 'sidebar.php?a=b';
} elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) ) {
if ( isset( $_POST['publish'] ) ) {
- if ( 'pending' == get_post_status( $page_ID ) )
- $location = add_query_arg( 'message', 6, get_edit_post_link( $page_ID, 'url' ) );
- else
- $location = add_query_arg( 'message', 5, get_edit_post_link( $page_ID, 'url' ) );
+ switch ( get_post_status( $page_ID ) ) {
+ case 'pending':
+ $location = add_query_arg( 'message', 6, get_edit_post_link( $page_ID, 'url' ) );
+ break;
+ case 'future':
+ $location = add_query_arg( 'message', 7, get_edit_post_link( $page_ID, 'url' ) );
+ break;
+ default:
+ $location = add_query_arg( 'message', 5, get_edit_post_link( $page_ID, 'url' ) );
+ }
} else {
$location = add_query_arg( 'message', 1, get_edit_post_link( $page_ID, 'url' ) );
}
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 14e32c99d..35636448a 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -40,10 +40,16 @@ function redirect_post($post_ID = '') {
$location = 'sidebar.php?a=b';
} elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) ) {
if ( isset( $_POST['publish'] ) ) {
- if ( 'pending' == get_post_status( $post_ID ) )
- $location = add_query_arg( 'message', 8, get_edit_post_link( $post_ID, 'url' ) );
- else
- $location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) );
+ switch ( get_post_status( $post_ID ) ) {
+ case 'pending':
+ $location = add_query_arg( 'message', 8, get_edit_post_link( $post_ID, 'url' ) );
+ break;
+ case 'future':
+ $location = add_query_arg( 'message', 9, get_edit_post_link( $post_ID, 'url' ) );
+ break;
+ default:
+ $location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) );
+ }
} else {
$location = add_query_arg( 'message', 1, get_edit_post_link( $post_ID, 'url' ) );
}