WordPress.org

Make WordPress Core

Ticket #18770: 18770-zeo.diff

File 18770-zeo.diff, 6.6 KB (added by Zeo, 3 years ago)

repair.php l10n tweak and more

  • wp-admin/maint/repair.php

     
    11<?php 
    2  
    32define('WP_REPAIRING', true); 
    43 
    54require_once('../../wp-load.php'); 
     
    1716<h1 id="logo"><img alt="WordPress" src="../images/wordpress-logo.png" /></h1> 
    1817 
    1918<?php 
    20  
    2119if ( !defined('WP_ALLOW_REPAIR') ) { 
    22         echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file.  Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>"; 
     20        echo '<p>' .__( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . '</p>'; 
     21        echo "<p><code>define('WP_ALLOW_REPAIR', true);</code></p>"; 
    2322} elseif ( isset($_GET['repair']) ) { 
    2423        check_admin_referer('repair_db'); 
    2524 
     
    4645                echo '<p>'; 
    4746                if ( 'OK' == $check->Msg_text ) { 
    4847                        /* translators: %s: table name */ 
    49                         printf( __( 'The %s table is okay.' ), $table ); 
     48                        printf( __( 'The %s table is okay.' ), "<code>$table</code>" ); 
    5049                } else { 
    5150                        /* translators: 1: table name, 2: error message, */ 
    52                         printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s.  WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" ); 
     51                        printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ); 
    5352 
    5453                        $repair = $wpdb->get_row("REPAIR TABLE $table"); 
    5554 
    5655                        echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;'; 
    5756                        if ( 'OK' == $check->Msg_text ) { 
    5857                                /* translators: %s: table name */ 
    59                                 printf( __( 'Successfully repaired the %s table.' ), $table ); 
     58                                printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" ); 
    6059                        } else { 
    6160                                /* translators: 1: table name, 2: error message, */ 
    62                                 echo sprintf( __( 'Failed to repair the  %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ) . '<br />'; 
     61                                echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />'; 
    6362                                $problems[$table] = $check->Msg_text; 
    6463                                $okay = false; 
    6564                        } 
     
    6867                if ( $okay && $optimize ) { 
    6968                        $check = $wpdb->get_row("ANALYZE TABLE $table"); 
    7069 
    71                         echo '<br />&nbsp;&nbsp;&nbsp;&nbsp'; 
     70                        echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;'; 
    7271                        if ( 'Table is already up to date' == $check->Msg_text )  { 
    7372                                /* translators: %s: table name */ 
    74                                 printf( __( 'The %s table is already optimized.' ), $table ); 
     73                                printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" ); 
    7574                        } else { 
    7675                                $check = $wpdb->get_row("OPTIMIZE TABLE $table"); 
    7776 
    78                                 echo '<br />&nbsp;&nbsp;&nbsp;&nbsp'; 
     77                                echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;'; 
    7978                                if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) { 
    8079                                        /* translators: %s: table name */ 
    81                                         printf( __( 'Successfully optimized the %s table.' ), $table ); 
     80                                        printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" ); 
    8281                                } else { 
    8382                                        /* translators: 1: table name, 2: error message, */ 
    84                                         printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ); 
     83                                        printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ); 
    8584                                } 
    8685                        } 
    8786                } 
     
    8988        } 
    9089 
    9190        if ( !empty($problems) ) { 
    92                 printf('<p>'.__('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.').'</p>', 'http://wordpress.org/support/forum/3'); 
     91                echo '<p>' . __( 'Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="http://wordpress.org/support/forum/3">WordPress support forums</a> to get additional assistance.' ) . '</p>'; 
    9392                $problem_output = array(); 
    9493                foreach ( $problems as $table => $problem ) 
    9594                        $problem_output[] = "$table: $problem"; 
    96                 echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>'; 
     95                echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea></p>'; 
    9796        } else { 
    98                 echo '<p>'.__('Repairs complete.  Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>"; 
     97                echo '<p>' . __( 'Repairs complete. Please remove the following line from <code>wp-config.php</code> to prevent this page from being used by unauthorized users.' ) . '</p>'; 
     98                echo "<p><code>define('WP_ALLOW_REPAIR', true);</code></p>"; 
    9999        } 
    100100} else { 
    101101        if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] ) 
    102                 _e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.'); 
     102                echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>'; 
    103103        else 
    104                 _e('WordPress can automatically look for some common database problems and repair them.  Repairing can take a while, so please be patient.') 
     104                echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>'; 
    105105?> 
    106106        <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p> 
    107         <?php _e('WordPress can also attempt to optimize the database.  This improves performance in some situations.  Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?> 
     107        <p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p> 
    108108        <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p> 
    109109<?php 
    110110} 
    111111?> 
     112 
    112113</body> 
    113114</html>