Ticket #30614: 30614.2.patch

src/wp-includes/general-template.php

@@ -609 +609 @@
         switch( $show ) {
                 case 'home' : // DEPRECATED
                 case 'siteurl' : // DEPRECATED
-                        _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> option instead.' ), 'url'  ) );
+                        /* translators: 1: 'siteurl' argument 2: 'url' argument */
+                        _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The %s option is deprecated for the family of <code>bloginfo()</code> functions.' ), '<code>' . $show . '</code>' ) . ' ' . sprintf( __( 'Use the %s option instead.' ), '<code>url</code>'  ) );
                 case 'url' :
                         $output = home_url();
                         break;
@@ -669 +670 @@
                         $output = str_replace('_', '-', $output);
                         break;
                 case 'text_direction':
-                        //_deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> function instead.' ), 'is_rtl()'  ) );
+                        /* translators: 1: 'text_direction' argument 2: is_rtl() function name */
+                        _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The %s option is deprecated for the family of <code>bloginfo()</code> functions.' ), '<code>' . $show . '</code>' ) . ' ' . sprintf( __( 'Use the %s function instead.' ), '<code>is_rtl()</code>'  ) );
+
                         if ( function_exists( 'is_rtl' ) ) {
                                 $output = is_rtl() ? 'rtl' : 'ltr';
                         } else {

src/wp-includes/ms-load.php

@@ -408 +408 @@
         $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
         $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
         if ( ! $wpdb->get_var( $query ) ) {
-                $msg .= '<p>' . sprintf( __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really should look at your database now.' ), $wpdb->site ) . '</p>';
+                $msg .= '<p>' . sprintf(
+                        /* translators: Site name */
+                        __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
+                        '<code>' . $wpdb->site . '</code>'
+                        ) . '</p>';
         } else {
-                $msg .= '<p>' . sprintf( __( '<strong>Could not find site <code>%1$s</code>.</strong> Searched for table <code>%2$s</code> in database <code>%3$s</code>. Is that right?' ), rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>';
+                $msg .= '<p>' . sprintf(
+                        /* translators: 1: Site url 2: Database blogs table 3: Database name */
+                        __( '<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?' ),
+                        '<code>' . rtrim( $domain . $path, '/' ) . '</code>',
+                        '<code>' . $wpdb->blogs . '</code>',
+                        '<code>' . DB_NAME . '</code>'
+                        ) . '</p>';
         }
         $msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
         $msg .= __( 'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' );