Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 09:07:59 +01:00
Code Issues Projects Releases Wiki Activity

Be more consistent with ERROR: messages. fixes #15887

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2011-09-30 17:18:35 +00:00
parent acbc9144dd
commit 37e23be4ed
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/admin-ajax.php
View File

@ -640,7 +640,7 @@ case 'replyto-comment' :
if ( empty($status) ) if ( empty($status) )
die('1'); die('1');
elseif ( in_array($status, array('draft', 'pending', 'trash') ) ) elseif ( in_array($status, array('draft', 'pending', 'trash') ) )
die( __('Error: you are replying to a comment on a draft post.') ); die( __('ERROR: you are replying to a comment on a draft post.') );
$user = wp_get_current_user(); $user = wp_get_current_user();
if ( $user->ID ) { if ( $user->ID ) {
@ -659,7 +659,7 @@ case 'replyto-comment' :
} }
if ( '' == $comment_content ) if ( '' == $comment_content )
die( __('Error: please type a comment.') ); die( __('ERROR: please type a comment.') );
$comment_parent = absint($_POST['comment_ID']); $comment_parent = absint($_POST['comment_ID']);
$comment_auto_approved = false; $comment_auto_approved = false;
@ -721,7 +721,7 @@ case 'edit-comment' :
die('-1'); die('-1');
if ( '' == $_POST['content'] ) if ( '' == $_POST['content'] )
die( __('Error: please type a comment.') ); die( __('ERROR: please type a comment.') );
$_POST['comment_status'] = $_POST['status']; $_POST['comment_status'] = $_POST['status'];
edit_comment(); edit_comment();

2
wp-admin/includes/file.php
View File

@ -965,7 +965,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
if ( !empty($credentials) ) if ( !empty($credentials) )
extract($credentials, EXTR_OVERWRITE); extract($credentials, EXTR_OVERWRITE);
if ( $error ) { if ( $error ) {
$error_string = __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.'); $error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
if ( is_wp_error($error) ) if ( is_wp_error($error) )
$error_string = esc_html( $error->get_error_message() ); $error_string = esc_html( $error->get_error_message() );
echo '<div id="message" class="error"><p>' . $error_string . '</p></div>'; echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';

2
wp-admin/includes/theme-install.php
View File

@ -237,7 +237,7 @@ function install_theme_information() {
iframe_header( __('Theme Install') ); iframe_header( __('Theme Install') );
if ( empty($api->download_link) ) { if ( empty($api->download_link) ) {
echo '<div id="message" class="error"><p>' . __('<strong>Error:</strong> This theme is currently not available. Please try again later.') . '</p></div>'; echo '<div id="message" class="error"><p>' . __('<strong>ERROR:</strong> This theme is currently not available. Please try again later.') . '</p></div>';
iframe_footer(); iframe_footer();
exit; exit;
} }

6
wp-admin/network.php
View File

@ -135,14 +135,14 @@ function network_step1( $errors = false ) {
global $is_apache; global $is_apache;
if ( get_option( 'siteurl' ) != get_option( 'home' ) ) { if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
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>'; 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>';
echo '</div>'; echo '</div>';
include ( ABSPATH . 'wp-admin/admin-footer.php' ); include ( ABSPATH . 'wp-admin/admin-footer.php' );
die(); die();
} }
if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>'; echo '<div class="error"><p><strong>' . __('ERROR:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
echo '</div>'; echo '</div>';
include ( ABSPATH . 'wp-admin/admin-footer.php' ); include ( ABSPATH . 'wp-admin/admin-footer.php' );
die(); die();
@ -159,7 +159,7 @@ function network_step1( $errors = false ) {
$hostname = get_clean_basedomain(); $hostname = get_clean_basedomain();
$has_ports = strstr( $hostname, ':' ); $has_ports = strstr( $hostname, ':' );
if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) { if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>'; echo '<div class="error"><p><strong>' . __( 'ERROR:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>'; echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>'; echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
echo '</div>'; echo '</div>';

2
wp-admin/options.php
View File

@ -110,7 +110,7 @@ if ( 'update' == $action ) {
} }
if ( !isset( $whitelist_options[ $option_page ] ) ) if ( !isset( $whitelist_options[ $option_page ] ) )
wp_die( __( 'Error: options page not found.' ) ); wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
if ( 'options' == $option_page ) { if ( 'options' == $option_page ) {
if ( is_multisite() && ! is_super_admin() ) if ( is_multisite() && ! is_super_admin() )

6
wp-comments-post.php
View File

@ -75,13 +75,13 @@ $comment_type = '';
if ( get_option('require_name_email') && !$user->ID ) { if ( get_option('require_name_email') && !$user->ID ) {
if ( 6 > strlen($comment_author_email) || '' == $comment_author ) if ( 6 > strlen($comment_author_email) || '' == $comment_author )
wp_die( __('Error: please fill the required fields (name, email).') ); wp_die( __('<strong>ERROR</strong>: please fill the required fields (name, email).') );
elseif ( !is_email($comment_author_email)) elseif ( !is_email($comment_author_email))
wp_die( __('Error: please enter a valid email address.') ); wp_die( __('<strong>ERROR</strong>: please enter a valid email address.') );
} }
if ( '' == $comment_content ) if ( '' == $comment_content )
wp_die( __('Error: please type a comment.') ); wp_die( __('<strong>ERROR</strong>: please type a comment.') );
$comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0; $comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;

2
wp-includes/js/tinymce/langs/wp-langs.php
View File

@ -24,7 +24,7 @@ not_set:"' . mce_escape( __('-- Not set --') ) . '",
clipboard_msg:"' . mce_escape( __('Copy/Cut/Paste is not available in Mozilla and Firefox.') ) . '", clipboard_msg:"' . mce_escape( __('Copy/Cut/Paste is not available in Mozilla and Firefox.') ) . '",
clipboard_no_support:"' . mce_escape( __('Currently not supported by your browser, use keyboard shortcuts instead.') ) . '", clipboard_no_support:"' . mce_escape( __('Currently not supported by your browser, use keyboard shortcuts instead.') ) . '",
popup_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.') ) . '", popup_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.') ) . '",
invalid_data:"' . mce_escape( __('Error: Invalid values entered, these are marked in red.') ) . '", invalid_data:"' . mce_escape( __('ERROR: Invalid values entered, these are marked in red.') ) . '",
invalid_data_number:"' . mce_escape( __('{#field} must be a number') ) . '", invalid_data_number:"' . mce_escape( __('{#field} must be a number') ) . '",
invalid_data_min:"' . mce_escape( __('{#field} must be a number greater than {#min}') ) . '", invalid_data_min:"' . mce_escape( __('{#field} must be a number greater than {#min}') ) . '",
invalid_data_size:"' . mce_escape( __('{#field} must be a number or percentage') ) . '", invalid_data_size:"' . mce_escape( __('{#field} must be a number or percentage') ) . '",

4
wp-includes/ms-functions.php
View File

@ -318,14 +318,14 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
// Check if the domain has been used already. We should return an error message. // Check if the domain has been used already. We should return an error message.
if ( domain_exists($domain, $path, $site_id) ) if ( domain_exists($domain, $path, $site_id) )
return __( 'Error: Site URL already taken.' ); return __( '<strong>ERROR</strong>: Site URL already taken.' );
// Need to back up wpdb table names, and create a new wp_blogs entry for new blog. // Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
// Need to get blog_id from wp_blogs, and create new table names. // Need to get blog_id from wp_blogs, and create new table names.
// Must restore table names at the end of function. // Must restore table names at the end of function.
if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
return __( 'Error: problem creating site entry.' ); return __( '<strong>ERROR</strong>: problem creating site entry.' );
switch_to_blog($blog_id); switch_to_blog($blog_id);
install_blog($blog_id); install_blog($blog_id);