Ticket #8300: 8300.patch

bp-activity/bp-activity-admin.php

@@ -85 +85 @@
 
         // Check that a reply has been entered.
         if ( empty( $_REQUEST['content'] ) )
-                die( __( 'ERROR: Please type a reply.', 'buddypress' ) );
+                die( __( 'Error: Please type a reply.', 'buddypress' ) );
 
         // Check parent activity exists.
         $parent_activity = new BP_Activity_Activity( $parent_id );
         if ( empty( $parent_activity->component ) )
-                die( __( 'ERROR: The item you are trying to reply to cannot be found, or it has been deleted.', 'buddypress' ) );
+                die( __( 'Error: The item you are trying to reply to cannot be found, or it has been deleted.', 'buddypress' ) );
 
         // @todo: Check if user is allowed to create new activity items
         // if ( ! current_user_can( 'bp_new_activity' ) )

bp-members/bp-members-functions.php

@@ -1364 +1364 @@
         // The user exists; now do a check to see if the user is a spammer
         // if the user is a spammer, stop them in their tracks!
         if ( is_a( $user, 'WP_User' ) && ( ( is_multisite() && (int) $user->spam ) || 1 == $user->user_status ) ) {
-                return new WP_Error( 'invalid_username', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.', 'buddypress' ) );
+                return new WP_Error( 'invalid_username', __( '<strong>Error</strong>: Your account has been marked as a spammer.', 'buddypress' ) );
         }
 
         // User is good to go!
@@ -2337 +2337 @@
         /* translators: %s: the activation url */
         $resend_string .= sprintf( __( 'If you have not received an email yet, <a href="%s">click here to resend it</a>.', 'buddypress' ), esc_url( $resend_url ) );
 
-        return new WP_Error( 'bp_account_not_activated', __( '<strong>ERROR</strong>: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) . $resend_string );
+        return new WP_Error( 'bp_account_not_activated', __( '<strong>Error</strong>: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) . $resend_string );
 }
 add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 30, 3 );
 
@@ -2368 +2368 @@
 
         // Add feedback message.
         if ( ! empty( $resend['errors'] ) ) {
-                $error = __( '<strong>ERROR</strong>: Your account has already been activated.', 'buddypress' );
+                $error = __( '<strong>Error</strong>: Your account has already been activated.', 'buddypress' );
         } else {
                 $error = __( 'Activation email resent! Please check your inbox or spam folder.', 'buddypress' );
         }
@@ -2513 +2513 @@
 function bp_live_spammer_login_error() {
         global $error;
 
-        $error = __( '<strong>ERROR</strong>: Your account has been marked as a spammer.', 'buddypress' );
+        $error = __( '<strong>Error</strong>: Your account has been marked as a spammer.', 'buddypress' );
 
         // Shake shake shake!
         add_action( 'login_head', 'wp_shake_js', 12 );