WordPress.org

Make WordPress Core

Ticket #22306: 22306.2.patch

File 22306.2.patch, 4.0 KB (added by pavelevap, 6 years ago)
  • wp-includes/functions.php

     
    27282728
    27292729</head>
    27302730<body>
    2731         <h1><?php _e( 'Error establishing a database connection' ); ?></h1>
     2731        <h1><?php _e( 'Error establishing database connection' ); ?></h1>
    27322732</body>
    27332733</html>
    27342734<?php
  • wp-includes/ms-load.php

     
    241241        $msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
    242242        $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
    243243        if ( false && !$wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
    244                 $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>';
     244                $msg .= '<p><strong>' . __( 'Database tables are missing.' ) . '</strong> ' . sprintf( __( '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>';
    245245        else
    246246                $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>';
    247247        $msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
  • wp-includes/wp-db.php

     
    11421142
    11431143                if ( !$this->dbh ) {
    11441144                        wp_load_translations_early();
    1145                         $this->bail( sprintf( __( "
    1146 <h1>Error establishing a database connection</h1>
     1145                        $this->bail( '<h1>' . __( 'Error establishing database connection' ) . '</h1>' . sprintf( __( "
    11471146<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
    11481147<ul>
    11491148        <li>Are you sure you have the correct username and password?</li>
  • wp-signup.php

     
    361361                <ul id="noemail-tips">
    362362                        <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
    363363                        <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
    364                         <li><?php printf( __( 'Have you entered your email correctly?  You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) ?></li>
     364                        <li><?php printf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) ?></li>
    365365                </ul>
    366366        </p>
    367367        <?php
     
    427427                                $newblog = get_blogaddress_by_name( $newblogname );
    428428
    429429                                if ( $active_signup == 'blog' || $active_signup == 'all' )
    430                                         printf( __( '<p><em>The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!</em></p>' ), $newblog );
     430                                        printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!' ) . '</p></em>', $newblog );
    431431                                else
    432                                         printf( __( '<p><em>The site you were looking for, <strong>%s</strong>, does not exist.</em></p>' ), $newblog );
     432                                        printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist.' ) . '</p></em>', $newblog );
    433433                        }
    434434                        break;
    435435        }