Ticket #2881: 2881.05.patch

src/includes/admin/admin.php

@@ -1060 +1060 @@
 
                                                         // Site errored out, no response?
                                                         if ( is_wp_error( $response ) ) {
-                                                                wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: <em>%2$s</em>', 'bbpress' ), $siteurl, $response->get_error_message() ) );
+                                                                wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s', 'bbpress' ), $siteurl, '<em>' . $response->get_error_message() . '</em>' ) );
                                                         }
 
                                                         // Switch to the new blog

src/includes/admin/forums.php

@@ -838 +838 @@
                         8 => sprintf( __( 'Forum submitted. <a target="_blank" href="%s">Preview forum</a>', 'bbpress' ), esc_url( add_query_arg( 'preview', 'true', $forum_url ) ) ),
 
                         // Forum scheduled
-                        9 => sprintf( __( 'Forum scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview forum</a>', 'bbpress' ),
+                        9 => sprintf(
+                                '%1$s <a target="_blank" href="%2$s">%3$s</a>',
+                                sprintf(
+                                        __( 'Forum scheduled for: %s.', 'bbpress' ),
                                         // translators: Publish box date format, see http://php.net/date
-                                        date_i18n( __( 'M j, Y @ G:i', 'bbpress' ),
-                                        strtotime( $post_date ) ),
-                                        $forum_url ),
+                                        '<strong>' . date_i18n( __( 'M j, Y @ G:i', 'bbpress' ), strtotime( $post_date ) ) . '</strong>'
+                                ),
+                                $forum_url,
+                                __( 'Preview forum', 'bbpress' )
+                        ),
 
                         // Forum draft updated
                         10 => sprintf( __( 'Forum draft updated. <a target="_blank" href="%s">Preview forum</a>', 'bbpress' ), esc_url( add_query_arg( 'preview', 'true', $forum_url ) ) ),

src/includes/admin/replies.php

@@ -961 +961 @@
                         8 => sprintf( __( 'Reply submitted. <a target="_blank" href="%s">Preview topic</a>', 'bbpress' ), esc_url( add_query_arg( 'preview', 'true', $topic_url ) ) ),
 
                         // Reply scheduled
-                        9 => sprintf( __( 'Reply scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview topic</a>', 'bbpress' ),
+                        9 => sprintf(
+                                '%1$s <a target="_blank" href="%2$s">%3$s</a>',
+                                sprintf(
+                                        __( 'Reply scheduled for: %s.', 'bbpress' ),
                                         // translators: Publish box date format, see http://php.net/date
-                                        date_i18n( __( 'M j, Y @ G:i', 'bbpress' ),
-                                        strtotime( $post_date ) ),
-                                        $topic_url ),
+                                        '<strong>' . date_i18n( __( 'M j, Y @ G:i', 'bbpress' ), strtotime( $post_date ) ) . '</strong>'
+                                ),
+                                $topic_url,
+                                __( 'Preview topic', 'bbpress' )
+                        ),
 
                         // Reply draft updated
                         10 => sprintf( __( 'Reply draft updated. <a target="_blank" href="%s">Preview topic</a>', 'bbpress' ), esc_url( add_query_arg( 'preview', 'true', $topic_url ) ) ),

src/includes/admin/topics.php

@@ -1114 +1114 @@
                         8 => sprintf( __( 'Topic submitted. <a target="_blank" href="%s">Preview topic</a>', 'bbpress' ), esc_url( add_query_arg( 'preview', 'true', $topic_url ) ) ),
 
                         // Topic scheduled
-                        9 => sprintf( __( 'Topic scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview topic</a>', 'bbpress' ),
+                        9 => sprintf(
+                                '%1$s <a target="_blank" href="%2$s">%3$s</a>',
+                                sprintf(
+                                        __( 'Topic scheduled for: %s.', 'bbpress' ),
                                         // translators: Publish box date format, see http://php.net/date
-                                        date_i18n( __( 'M j, Y @ G:i', 'bbpress' ),
-                                        strtotime( $post_date ) ),
-                                        $topic_url ),
+                                        '<strong>' . date_i18n( __( 'M j, Y @ G:i', 'bbpress' ), strtotime( $post_date ) ) . '</strong>'
+                                ),
+                                $topic_url,
+                                __( 'Preview topic', 'bbpress' )
+                        ),
 
                         // Topic draft updated
                         10 => sprintf( __( 'Topic draft updated. <a target="_blank" href="%s">Preview topic</a>', 'bbpress' ), esc_url( add_query_arg( 'preview', 'true', $topic_url ) ) ),