Make WordPress Core

Ticket #15887: t15887-Capitalize-ERROR-2.diff

File t15887-Capitalize-ERROR-2.diff, 10.0 KB (added by JDTrower, 14 years ago)

Second go at being consistent with ERROR.

  • wp-admin/admin-ajax.php

     
    638638        if ( empty($status) )
    639639                die('1');
    640640        elseif ( in_array($status, array('draft', 'pending', 'trash') ) )
    641                 die( __('Error: you are replying to a comment on a draft post.') );
     641                die( __('<strong>ERROR</strong>: you are replying to a comment on a draft post.') );
    642642
    643643        $user = wp_get_current_user();
    644644        if ( $user->ID ) {
     
    657657        }
    658658
    659659        if ( '' == $comment_content )
    660                 die( __('Error: please type a comment.') );
     660                die( __('<strong>ERROR</strong>: please type a comment.') );
    661661
    662662        $comment_parent = absint($_POST['comment_ID']);
    663663        $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
     
    704704                die('-1');
    705705
    706706        if ( '' == $_POST['content'] )
    707                 die( __('Error: please type a comment.') );
     707                die( __('<strong>ERROR</strong>: please type a comment.') );
    708708
    709709        $comment_id = (int) $_POST['comment_ID'];
    710710        $_POST['comment_status'] = $_POST['status'];
  • wp-admin/includes/class-wp-importer.php

     
    125125                } else {
    126126                        $blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
    127127                        if ( ( !$parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
    128                                 fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
     128                                fwrite( STDERR, "<strong>ERROR</strong>: can not determine blog_id from $blog_id\n" );
    129129                                exit();
    130130                        }
    131131                        if ( empty( $parsed['path'] ) )
    132132                                $parsed['path'] = '/';
    133133                        $blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) );
    134134                        if ( !$blog ) {
    135                                 fwrite( STDERR, "Error: Could not find blog\n" );
     135                                fwrite( STDERR, "<strong>ERROR</strong>: Could not find blog\n" );
    136136                                exit();
    137137                        }
    138138                        $blog_id = (int) $blog->blog_id;
     
    157157                }
    158158
    159159                if ( !$user_id || !wp_set_current_user( $user_id ) ) {
    160                         fwrite( STDERR, "Error: can not find user\n" );
     160                        fwrite( STDERR, "<strong>ERROR</strong>: can not find user\n" );
    161161                        exit();
    162162                }
    163163
  • wp-admin/includes/file.php

     
    945945        if ( !empty($credentials) )
    946946                extract($credentials, EXTR_OVERWRITE);
    947947        if ( $error ) {
    948                 $error_string = __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.');
     948                $error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
    949949                if ( is_wp_error($error) )
    950950                        $error_string = esc_html( $error->get_error_message() );
    951951                echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
  • wp-admin/includes/theme-install.php

     
    237237        iframe_header( __('Theme Install') );
    238238
    239239        if ( empty($api->download_link) ) {
    240                 echo '<div id="message" class="error"><p>' . __('<strong>Error:</strong> This theme is currently not available. Please try again later.') . '</p></div>';
     240                echo '<div id="message" class="error"><p>' . __('<strong>ERROR:</strong> This theme is currently not available. Please try again later.') . '</p></div>';
    241241                iframe_footer();
    242242                exit;
    243243        }
  • wp-admin/install.php

     
    1313<html xmlns="http://www.w3.org/1999/xhtml" >
    1414<head>
    1515        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    16         <title>Error: PHP is not running</title>
     16        <title>ERROR: PHP is not running</title>
    1717</head>
    1818<body>
    1919        <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
    20         <h2>Error: PHP is not running</h2>
     20        <h2><strong>ERROR<strong>: PHP is not running</h2>
    2121        <p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
    2222</body>
    2323</html>
  • wp-admin/maint/repair.php

     
    4747                        if ( 'OK' == $check->Msg_text ) {
    4848                                echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Successfully repaired the $table table.";
    4949                        } else {
    50                                 echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to repair the $table table. Error: $check->Msg_text<br />";
     50                                echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to repair the $table table. <strong>ERROR</strong>: $check->Msg_text<br />";
    5151                                $problems["$table"] = $check->Msg_text;
    5252                                $okay = false;
    5353                        }
     
    6161                                if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text )
    6262                                        echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Successfully optimized the $table table.";
    6363                                else
    64                                         echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to optimize the $table table. Error: $check->Msg_text";
     64                                        echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to optimize the $table table. <strong>ERROR</strong>: $check->Msg_text";
    6565                        }
    6666                }
    6767                echo '</p>';
  • wp-admin/network.php

     
    135135        global $is_apache;
    136136
    137137        if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
    138                 echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</p></div>';
     138                echo '<div class="error"><p><strong>' . __('ERROR:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</p></div>';
    139139                echo '</div>';
    140140                include ( ABSPATH . 'wp-admin/admin-footer.php' );
    141141                die();
    142142        }
    143143
    144144        if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
    145                 echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
     145                echo '<div class="error"><p><strong>' . __('ERROR:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
    146146                echo '</div>';
    147147                include ( ABSPATH . 'wp-admin/admin-footer.php' );
    148148                die();
     
    159159        $hostname = get_clean_basedomain();
    160160        $has_ports = strstr( $hostname, ':' );
    161161        if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
    162                 echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
     162                echo '<div class="error"><p><strong>' . __( 'ERROR:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
    163163                echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
    164164                echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
    165165                echo '</div>';
  • wp-admin/options.php

     
    106106        }
    107107
    108108        if ( !isset( $whitelist_options[ $option_page ] ) )
    109                 wp_die( __( 'Error: options page not found.' ) );
     109                wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
    110110
    111111        if ( 'options' == $option_page ) {
    112112                if ( is_multisite() && ! is_super_admin() )
  • wp-comments-post.php

     
    7575
    7676if ( get_option('require_name_email') && !$user->ID ) {
    7777        if ( 6 > strlen($comment_author_email) || '' == $comment_author )
    78                 wp_die( __('Error: please fill the required fields (name, email).') );
     78                wp_die( __('<strong>ERROR</strong>: please fill the required fields (name, email).') );
    7979        elseif ( !is_email($comment_author_email))
    80                 wp_die( __('Error: please enter a valid email address.') );
     80                wp_die( __('<strong>ERROR</strong:> please enter a valid email address.') );
    8181}
    8282
    8383if ( '' == $comment_content )
    84         wp_die( __('Error: please type a comment.') );
     84        wp_die( __('<strong>ERROR</strong>: please type a comment.') );
    8585
    8686$comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;
    8787
  • wp-includes/ms-functions.php

     
    314314
    315315        // Check if the domain has been used already. We should return an error message.
    316316        if ( domain_exists($domain, $path, $site_id) )
    317                 return __( 'Error: Site URL already taken.' );
     317                return __( '<strong>ERROR</strong>: Site URL already taken.' );
    318318
    319319        // Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
    320320        // Need to get blog_id from wp_blogs, and create new table names.
    321321        // Must restore table names at the end of function.
    322322
    323323        if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
    324                 return __( 'Error: problem creating site entry.' );
     324                return __( '<strong>ERROR</strong>: problem creating site entry.' );
    325325
    326326        switch_to_blog($blog_id);
    327327        install_blog($blog_id);