Changeset 47154

Timestamp:

02/01/2020 08:53:14 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Text Changes: Capitalize error messages consistently.

Props Presskopp.
Fixes #42945.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (3 diffs)
• wp-admin/options.php (modified) (1 diff)
• wp-includes/comment.php (modified) (3 diffs)
• wp-includes/ms-deprecated.php (modified) (1 diff)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -1273 +1273 @@
         wp_die( 1 );
     } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ) ) ) {
-        wp_die( __( 'ERROR: you are replying to a comment on a draft post.' ) );
+        wp_die( __( 'ERROR: You are replying to a comment on a draft post.' ) );
     }
 
@@ -1303 +1303 @@
 
     if ( '' == $comment_content ) {
-        wp_die( __( 'ERROR: please type a comment.' ) );
+        wp_die( __( 'ERROR: Please type a comment.' ) );
     }
 
@@ -1405 +1405 @@
 
     if ( '' == $_POST['content'] ) {
-        wp_die( __( 'ERROR: please type a comment.' ) );
+        wp_die( __( 'ERROR: Please type a comment.' ) );
     }
 

trunk/src/wp-admin/options.php

@@ -218 +218 @@
 
     if ( ! isset( $whitelist_options[ $option_page ] ) ) {
-        wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+        wp_die( __( '<strong>ERROR</strong>: Options page not found.' ) );
     }
 

trunk/src/wp-includes/comment.php

@@ -1225 +1225 @@
 
     if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
-        return new WP_Error( 'comment_author_column_length', __( '<strong>ERROR</strong>: your name is too long.' ), 200 );
+        return new WP_Error( 'comment_author_column_length', __( '<strong>ERROR</strong>: Your name is too long.' ), 200 );
     }
 
     if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) {
-        return new WP_Error( 'comment_author_email_column_length', __( '<strong>ERROR</strong>: your email address is too long.' ), 200 );
+        return new WP_Error( 'comment_author_email_column_length', __( '<strong>ERROR</strong>: Your email address is too long.' ), 200 );
     }
 
     if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
-        return new WP_Error( 'comment_author_url_column_length', __( '<strong>ERROR</strong>: your url is too long.' ), 200 );
+        return new WP_Error( 'comment_author_url_column_length', __( '<strong>ERROR</strong>: Your url is too long.' ), 200 );
     }
 
     if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
-        return new WP_Error( 'comment_content_column_length', __( '<strong>ERROR</strong>: your comment is too long.' ), 200 );
+        return new WP_Error( 'comment_content_column_length', __( '<strong>ERROR</strong>: Your comment is too long.' ), 200 );
     }
 
@@ -3353 +3353 @@
     if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
         if ( '' == $comment_author_email || '' == $comment_author ) {
-            return new WP_Error( 'require_name_email', __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
+            return new WP_Error( 'require_name_email', __( '<strong>ERROR</strong>: Please fill the required fields (name, email).' ), 200 );
         } elseif ( ! is_email( $comment_author_email ) ) {
-            return new WP_Error( 'require_valid_email', __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );
+            return new WP_Error( 'require_valid_email', __( '<strong>ERROR</strong>: Please enter a valid email address.' ), 200 );
         }
     }
@@ -3380 +3380 @@
     $allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata );
     if ( '' === $comment_content && ! $allow_empty_comment ) {
-        return new WP_Error( 'require_valid_comment', __( '<strong>ERROR</strong>: please type a comment.' ), 200 );
+        return new WP_Error( 'require_valid_comment', __( '<strong>ERROR</strong>: Please type a comment.' ), 200 );
     }
 

trunk/src/wp-includes/ms-deprecated.php

@@ -411 +411 @@
 
     if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-        return __( '<strong>ERROR</strong>: problem creating site entry.' );
+        return __( '<strong>ERROR</strong>: Problem creating site entry.' );
 
     switch_to_blog($blog_id);