WordPress.org

Make WordPress Core

Changeset 18841


Ignore:
Timestamp:
09/30/2011 05:18:35 PM (7 years ago)
Author:
markjaquith
Message:

Be more consistent with ERROR: messages. fixes #15887

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-ajax.php

    r18820 r18841  
    641641        die('1');
    642642    elseif ( in_array($status, array('draft', 'pending', 'trash') ) )
    643         die( __('Error: you are replying to a comment on a draft post.') );
     643        die( __('ERROR: you are replying to a comment on a draft post.') );
    644644
    645645    $user = wp_get_current_user();
     
    660660
    661661    if ( '' == $comment_content )
    662         die( __('Error: please type a comment.') );
     662        die( __('ERROR: please type a comment.') );
    663663
    664664    $comment_parent = absint($_POST['comment_ID']);
     
    722722
    723723    if ( '' == $_POST['content'] )
    724         die( __('Error: please type a comment.') );
     724        die( __('ERROR: please type a comment.') );
    725725
    726726    $_POST['comment_status'] = $_POST['status'];
  • trunk/wp-admin/includes/file.php

    r18632 r18841  
    966966        extract($credentials, EXTR_OVERWRITE);
    967967    if ( $error ) {
    968         $error_string = __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.');
     968        $error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
    969969        if ( is_wp_error($error) )
    970970            $error_string = esc_html( $error->get_error_message() );
  • trunk/wp-admin/includes/theme-install.php

    r18462 r18841  
    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;
  • trunk/wp-admin/network.php

    r18692 r18841  
    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' );
     
    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' );
     
    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>';
  • trunk/wp-admin/options.php

    r17986 r18841  
    111111
    112112    if ( !isset( $whitelist_options[ $option_page ] ) )
    113         wp_die( __( 'Error: options page not found.' ) );
     113        wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
    114114
    115115    if ( 'options' == $option_page ) {
  • trunk/wp-comments-post.php

    r16847 r18841  
    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;
  • trunk/wp-includes/js/tinymce/langs/wp-langs.php

    r18518 r18841  
    2525clipboard_no_support:"' . mce_escape( __('Currently not supported by your browser, use keyboard shortcuts instead.') ) . '",
    2626popup_blocked:"' . mce_escape( __('Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.') ) . '",
    27 invalid_data:"' . mce_escape( __('Error: Invalid values entered, these are marked in red.') ) . '",
     27invalid_data:"' . mce_escape( __('ERROR: Invalid values entered, these are marked in red.') ) . '",
    2828invalid_data_number:"' . mce_escape( __('{#field} must be a number') ) . '",
    2929invalid_data_min:"' . mce_escape( __('{#field} must be a number greater than {#min}') ) . '",
  • trunk/wp-includes/ms-functions.php

    r18834 r18841  
    319319    // Check if the domain has been used already. We should return an error message.
    320320    if ( domain_exists($domain, $path, $site_id) )
    321         return __( 'Error: Site URL already taken.' );
     321        return __( '<strong>ERROR</strong>: Site URL already taken.' );
    322322
    323323    // Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
     
    326326
    327327    if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
    328         return __( 'Error: problem creating site entry.' );
     328        return __( '<strong>ERROR</strong>: problem creating site entry.' );
    329329
    330330    switch_to_blog($blog_id);
Note: See TracChangeset for help on using the changeset viewer.