Skip to:
Content

bbPress.org

Changeset 7097


Ignore:
Timestamp:
06/04/2020 09:28:24 PM (18 months ago)
Author:
johnjamesjacoby
Message:

Accessibility: Text Changes: Use sentence case for the word "Error" in various error messages, instead of all caps.

Using all caps should be avoided for better readability, and because screen readers may pronounce all-caps words as abbreviations.

Related to [WP47156], #WP47656, #WP43037, #WP42945.

Props casiepa, man4toman, mmeet94, SergeyBiryukov, afercia, ryokuhi, sabernhardt, garrett-eclipse.

In branches/2.6, for 2.6.6.

See #3333, #3377.

Location:
branches/2.6/src/includes
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/2.6/src/includes/common/functions.php

    r6973 r7097  
    554554    $r['bbp_anonymous_name'] = apply_filters( 'bbp_pre_anonymous_post_author_name', $r['bbp_anonymous_name'] );
    555555    if ( empty( $r['bbp_anonymous_name'] ) ) {
    556         bbp_add_error( 'bbp_anonymous_name',  __( '<strong>ERROR</strong>: Invalid author name.', 'bbpress' ) );
     556        bbp_add_error( 'bbp_anonymous_name',  __( '<strong>Error</strong>: Invalid author name.', 'bbpress' ) );
    557557    }
    558558
     
    560560    $r['bbp_anonymous_email'] = apply_filters( 'bbp_pre_anonymous_post_author_email', $r['bbp_anonymous_email'] );
    561561    if ( empty( $r['bbp_anonymous_email'] ) ) {
    562         bbp_add_error( 'bbp_anonymous_email', __( '<strong>ERROR</strong>: Invalid email address.', 'bbpress' ) );
     562        bbp_add_error( 'bbp_anonymous_email', __( '<strong>Error</strong>: Invalid email address.', 'bbpress' ) );
    563563    }
    564564
  • branches/2.6/src/includes/extend/buddypress/groups.php

    r7059 r7097  
    377377        // If everything else has failed, then something is wrong and we need
    378378        // to add an error to prevent this topic from saving.
    379         bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum ID is invalid.', 'bbpress' ) );
     379        bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum ID is invalid.', 'bbpress' ) );
    380380    }
    381381
     
    440440
    441441        // Add an error to prevent this reply from saving.
    442         bbp_add_error( 'bbp_reply_to_id', __( '<strong>ERROR</strong>: Reply To is invalid.', 'bbpress' ) );
     442        bbp_add_error( 'bbp_reply_to_id', __( '<strong>Error</strong>: Reply To is invalid.', 'bbpress' ) );
    443443    }
    444444
     
    529529        // Theme-side Nonce check
    530530        } elseif ( ! bbp_verify_nonce_request( 'groups_edit_save_' . $this->slug ) ) {
    531             bbp_add_error( 'bbp_edit_group_forum_screen_save', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     531            bbp_add_error( 'bbp_edit_group_forum_screen_save', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    532532            return;
    533533        }
     
    686686        // Nonce check
    687687        if ( ! bbp_verify_nonce_request( 'groups_create_save_' . $this->slug ) ) {
    688             bbp_add_error( 'bbp_create_group_forum_screen_save', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     688            bbp_add_error( 'bbp_create_group_forum_screen_save', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    689689            return;
    690690        }
  • branches/2.6/src/includes/extend/buddypress/notifications.php

    r6982 r7097  
    194194    // Check nonce
    195195    if ( ! bbp_verify_nonce_request( 'bbp_mark_topic_' . $topic_id ) ) {
    196         bbp_add_error( 'bbp_notification_topic_id', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     196        bbp_add_error( 'bbp_notification_topic_id', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    197197
    198198    // Check current user's ability to edit the user
    199199    } elseif ( ! current_user_can( 'edit_user', $user_id ) ) {
    200         bbp_add_error( 'bbp_notification_permission', __( '<strong>ERROR</strong>: You do not have permission to mark notifications for that user.', 'bbpress' ) );
     200        bbp_add_error( 'bbp_notification_permission', __( '<strong>Error</strong>: You do not have permission to mark notifications for that user.', 'bbpress' ) );
    201201    }
    202202
  • branches/2.6/src/includes/forums/functions.php

    r6971 r7097  
    124124    // Nonce check
    125125    if ( ! bbp_verify_nonce_request( 'bbp-new-forum' ) ) {
    126         bbp_add_error( 'bbp_new_forum_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     126        bbp_add_error( 'bbp_new_forum_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    127127        return;
    128128    }
     
    138138    // User cannot create forums
    139139    if ( ! current_user_can( 'publish_forums' ) ) {
    140         bbp_add_error( 'bbp_forum_permission', __( '<strong>ERROR</strong>: You do not have permission to create new forums.', 'bbpress' ) );
     140        bbp_add_error( 'bbp_forum_permission', __( '<strong>Error</strong>: You do not have permission to create new forums.', 'bbpress' ) );
    141141        return;
    142142    }
     
    163163    // No forum title
    164164    if ( empty( $forum_title ) ) {
    165         bbp_add_error( 'bbp_forum_title', __( '<strong>ERROR</strong>: Your forum needs a title.', 'bbpress' ) );
     165        bbp_add_error( 'bbp_forum_title', __( '<strong>Error</strong>: Your forum needs a title.', 'bbpress' ) );
    166166    }
    167167
    168168    // Title too long
    169169    if ( bbp_is_title_too_long( $forum_title ) ) {
    170         bbp_add_error( 'bbp_forum_title', __( '<strong>ERROR</strong>: Your title is too long.', 'bbpress' ) );
     170        bbp_add_error( 'bbp_forum_title', __( '<strong>Error</strong>: Your title is too long.', 'bbpress' ) );
    171171    }
    172172
     
    182182    // No forum content
    183183    if ( empty( $forum_content ) ) {
    184         bbp_add_error( 'bbp_forum_content', __( '<strong>ERROR</strong>: Your forum description cannot be empty.', 'bbpress' ) );
     184        bbp_add_error( 'bbp_forum_content', __( '<strong>Error</strong>: Your forum description cannot be empty.', 'bbpress' ) );
    185185    }
    186186
     
    197197    // No forum parent was passed (should never happen)
    198198    if ( empty( $forum_parent_id ) ) {
    199         bbp_add_error( 'bbp_new_forum_missing_parent', __( '<strong>ERROR</strong>: Your forum must have a parent.', 'bbpress' ) );
     199        bbp_add_error( 'bbp_new_forum_missing_parent', __( '<strong>Error</strong>: Your forum must have a parent.', 'bbpress' ) );
    200200
    201201    // Forum exists
     
    204204        // Forum is a category
    205205        if ( bbp_is_forum_category( $forum_parent_id ) ) {
    206             bbp_add_error( 'bbp_new_forum_forum_category', __( '<strong>ERROR</strong>: This forum is a category. No forums can be created in this forum.', 'bbpress' ) );
     206            bbp_add_error( 'bbp_new_forum_forum_category', __( '<strong>Error</strong>: This forum is a category. No forums can be created in this forum.', 'bbpress' ) );
    207207        }
    208208
    209209        // Forum is closed and user cannot access
    210210        if ( bbp_is_forum_closed( $forum_parent_id ) && ! current_user_can( 'edit_forum', $forum_parent_id ) ) {
    211             bbp_add_error( 'bbp_new_forum_forum_closed', __( '<strong>ERROR</strong>: This forum has been closed to new forums.', 'bbpress' ) );
     211            bbp_add_error( 'bbp_new_forum_forum_closed', __( '<strong>Error</strong>: This forum has been closed to new forums.', 'bbpress' ) );
    212212        }
    213213
    214214        // Forum is private and user cannot access
    215215        if ( bbp_is_forum_private( $forum_parent_id ) && ! current_user_can( 'read_forum', $forum_parent_id ) ) {
    216             bbp_add_error( 'bbp_new_forum_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new forums in it.', 'bbpress' ) );
     216            bbp_add_error( 'bbp_new_forum_forum_private', __( '<strong>Error</strong>: This forum is private and you do not have the capability to read or create new forums in it.', 'bbpress' ) );
    217217        }
    218218
    219219        // Forum is hidden and user cannot access
    220220        if ( bbp_is_forum_hidden( $forum_parent_id ) && ! current_user_can( 'read_forum', $forum_parent_id ) ) {
    221             bbp_add_error( 'bbp_new_forum_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new forums in it.', 'bbpress' ) );
     221            bbp_add_error( 'bbp_new_forum_forum_hidden', __( '<strong>Error</strong>: This forum is hidden and you do not have the capability to read or create new forums in it.', 'bbpress' ) );
    222222        }
    223223    }
     
    226226
    227227    if ( ! bbp_check_for_flood( $anonymous_data, $forum_author ) ) {
    228         bbp_add_error( 'bbp_forum_flood', __( '<strong>ERROR</strong>: Slow down; you move too fast.', 'bbpress' ) );
     228        bbp_add_error( 'bbp_forum_flood', __( '<strong>Error</strong>: Slow down; you move too fast.', 'bbpress' ) );
    229229    }
    230230
     
    232232
    233233    if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_forum_post_type(), 'post_author' => $forum_author, 'post_content' => $forum_content, 'anonymous_data' => $anonymous_data ) ) ) {
    234         bbp_add_error( 'bbp_forum_duplicate', __( '<strong>ERROR</strong>: This forum already exists.', 'bbpress' ) );
     234        bbp_add_error( 'bbp_forum_duplicate', __( '<strong>Error</strong>: This forum already exists.', 'bbpress' ) );
    235235    }
    236236
     
    238238
    239239    if ( ! bbp_check_for_moderation( $anonymous_data, $forum_author, $forum_title, $forum_content, true ) ) {
    240         bbp_add_error( 'bbp_forum_moderation', __( '<strong>ERROR</strong>: Your forum cannot be created at this time.', 'bbpress' ) );
     240        bbp_add_error( 'bbp_forum_moderation', __( '<strong>Error</strong>: Your forum cannot be created at this time.', 'bbpress' ) );
    241241    }
    242242
     
    351351    // WP_Error
    352352    } elseif ( is_wp_error( $forum_id ) ) {
    353         bbp_add_error( 'bbp_forum_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) occurred: %s', 'bbpress' ), $forum_id->get_error_message() ) );
     353        bbp_add_error( 'bbp_forum_error', sprintf( __( '<strong>Error</strong>: The following problem(s) occurred: %s', 'bbpress' ), $forum_id->get_error_message() ) );
    354354
    355355    // Generic error
    356356    } else {
    357         bbp_add_error( 'bbp_forum_error', __( '<strong>ERROR</strong>: The forum was not created.', 'bbpress' ) );
     357        bbp_add_error( 'bbp_forum_error', __( '<strong>Error</strong>: The forum was not created.', 'bbpress' ) );
    358358    }
    359359}
     
    380380    // Forum id was not passed
    381381    if ( empty( $_POST['bbp_forum_id'] ) ) {
    382         bbp_add_error( 'bbp_edit_forum_id', __( '<strong>ERROR</strong>: Forum ID not found.', 'bbpress' ) );
     382        bbp_add_error( 'bbp_edit_forum_id', __( '<strong>Error</strong>: Forum ID not found.', 'bbpress' ) );
    383383        return;
    384384
     
    391391    // Nonce check
    392392    if ( ! bbp_verify_nonce_request( 'bbp-edit-forum_' . $forum_id ) ) {
    393         bbp_add_error( 'bbp_edit_forum_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     393        bbp_add_error( 'bbp_edit_forum_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    394394        return;
    395395
    396396    // Forum does not exist
    397397    } elseif ( empty( $forum ) ) {
    398         bbp_add_error( 'bbp_edit_forum_not_found', __( '<strong>ERROR</strong>: The forum you want to edit was not found.', 'bbpress' ) );
     398        bbp_add_error( 'bbp_edit_forum_not_found', __( '<strong>Error</strong>: The forum you want to edit was not found.', 'bbpress' ) );
    399399        return;
    400400
    401401    // User cannot edit this forum
    402402    } elseif ( ! current_user_can( 'edit_forum', $forum_id ) ) {
    403         bbp_add_error( 'bbp_edit_forum_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that forum.', 'bbpress' ) );
     403        bbp_add_error( 'bbp_edit_forum_permission', __( '<strong>Error</strong>: You do not have permission to edit that forum.', 'bbpress' ) );
    404404        return;
    405405    }
     
    427427        // Forum is closed and user cannot access
    428428        if ( bbp_is_forum_closed( $forum_parent_id ) && ! current_user_can( 'edit_forum', $forum_parent_id ) ) {
    429             bbp_add_error( 'bbp_edit_forum_forum_closed', __( '<strong>ERROR</strong>: This forum has been closed to new forums.', 'bbpress' ) );
     429            bbp_add_error( 'bbp_edit_forum_forum_closed', __( '<strong>Error</strong>: This forum has been closed to new forums.', 'bbpress' ) );
    430430        }
    431431
    432432        // Forum is private and user cannot access
    433433        if ( bbp_is_forum_private( $forum_parent_id ) && ! current_user_can( 'read_forum', $forum_parent_id ) ) {
    434             bbp_add_error( 'bbp_edit_forum_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new forums in it.', 'bbpress' ) );
     434            bbp_add_error( 'bbp_edit_forum_forum_private', __( '<strong>Error</strong>: This forum is private and you do not have the capability to read or create new forums in it.', 'bbpress' ) );
    435435        }
    436436
    437437        // Forum is hidden and user cannot access
    438438        if ( bbp_is_forum_hidden( $forum_parent_id ) && ! current_user_can( 'read_forum', $forum_parent_id ) ) {
    439             bbp_add_error( 'bbp_edit_forum_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new forums in it.', 'bbpress' ) );
     439            bbp_add_error( 'bbp_edit_forum_forum_hidden', __( '<strong>Error</strong>: This forum is hidden and you do not have the capability to read or create new forums in it.', 'bbpress' ) );
    440440        }
    441441    }
     
    452452    // No forum title
    453453    if ( empty( $forum_title ) ) {
    454         bbp_add_error( 'bbp_edit_forum_title', __( '<strong>ERROR</strong>: Your forum needs a title.', 'bbpress' ) );
     454        bbp_add_error( 'bbp_edit_forum_title', __( '<strong>Error</strong>: Your forum needs a title.', 'bbpress' ) );
    455455    }
    456456
    457457    // Title too long
    458458    if ( bbp_is_title_too_long( $forum_title ) ) {
    459         bbp_add_error( 'bbp_forum_title', __( '<strong>ERROR</strong>: Your title is too long.', 'bbpress' ) );
     459        bbp_add_error( 'bbp_forum_title', __( '<strong>Error</strong>: Your title is too long.', 'bbpress' ) );
    460460    }
    461461
     
    471471    // No forum content
    472472    if ( empty( $forum_content ) ) {
    473         bbp_add_error( 'bbp_edit_forum_content', __( '<strong>ERROR</strong>: Your forum description cannot be empty.', 'bbpress' ) );
     473        bbp_add_error( 'bbp_edit_forum_content', __( '<strong>Error</strong>: Your forum description cannot be empty.', 'bbpress' ) );
    474474    }
    475475
     
    477477
    478478    if ( ! bbp_check_for_moderation( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content, true ) ) {
    479         bbp_add_error( 'bbp_forum_moderation', __( '<strong>ERROR</strong>: Your forum cannot be edited at this time.', 'bbpress' ) );
     479        bbp_add_error( 'bbp_forum_moderation', __( '<strong>Error</strong>: Your forum cannot be edited at this time.', 'bbpress' ) );
    480480    }
    481481
     
    591591    } else {
    592592        $append_error = ( is_wp_error( $forum_id ) && $forum_id->get_error_message() ) ? $forum_id->get_error_message() . ' ' : '';
    593         bbp_add_error( 'bbp_forum_error', __( '<strong>ERROR</strong>: The following problem(s) have been found with your forum:' . $append_error . 'Please try again.', 'bbpress' ) );
     593        bbp_add_error( 'bbp_forum_error', __( '<strong>Error</strong>: The following problem(s) have been found with your forum:' . $append_error . 'Please try again.', 'bbpress' ) );
    594594    }
    595595}
  • branches/2.6/src/includes/replies/functions.php

    r7095 r7097  
    132132    // Nonce check
    133133    if ( ! bbp_verify_nonce_request( 'bbp-new-reply' ) ) {
    134         bbp_add_error( 'bbp_new_reply_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     134        bbp_add_error( 'bbp_new_reply_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    135135        return;
    136136    }
     
    157157        // User cannot create replies
    158158        if ( ! current_user_can( 'publish_replies' ) ) {
    159             bbp_add_error( 'bbp_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to reply.', 'bbpress' ) );
     159            bbp_add_error( 'bbp_reply_permission', __( '<strong>Error</strong>: You do not have permission to reply.', 'bbpress' ) );
    160160        }
    161161
     
    168168    // Topic id was not passed
    169169    if ( empty( $_POST['bbp_topic_id'] ) ) {
    170         bbp_add_error( 'bbp_reply_topic_id', __( '<strong>ERROR</strong>: Topic ID is missing.', 'bbpress' ) );
     170        bbp_add_error( 'bbp_reply_topic_id', __( '<strong>Error</strong>: Topic ID is missing.', 'bbpress' ) );
    171171
    172172    // Topic id is not a number
    173173    } elseif ( ! is_numeric( $_POST['bbp_topic_id'] ) ) {
    174         bbp_add_error( 'bbp_reply_topic_id', __( '<strong>ERROR</strong>: Topic ID must be a number.', 'bbpress' ) );
     174        bbp_add_error( 'bbp_reply_topic_id', __( '<strong>Error</strong>: Topic ID must be a number.', 'bbpress' ) );
    175175
    176176    // Topic id might be valid
     
    182182        // Topic id is a negative number
    183183        if ( 0 > $posted_topic_id ) {
    184             bbp_add_error( 'bbp_reply_topic_id', __( '<strong>ERROR</strong>: Topic ID cannot be a negative number.', 'bbpress' ) );
     184            bbp_add_error( 'bbp_reply_topic_id', __( '<strong>Error</strong>: Topic ID cannot be a negative number.', 'bbpress' ) );
    185185
    186186        // Topic does not exist
    187187        } elseif ( ! bbp_get_topic( $posted_topic_id ) ) {
    188             bbp_add_error( 'bbp_reply_topic_id', __( '<strong>ERROR</strong>: Topic does not exist.', 'bbpress' ) );
     188            bbp_add_error( 'bbp_reply_topic_id', __( '<strong>Error</strong>: Topic does not exist.', 'bbpress' ) );
    189189
    190190        // Use the POST'ed topic id
     
    205205        // Empty Forum id was passed
    206206        if ( empty( $_POST['bbp_forum_id'] ) ) {
    207             bbp_add_error( 'bbp_reply_forum_id', __( '<strong>ERROR</strong>: Forum ID is missing.', 'bbpress' ) );
     207            bbp_add_error( 'bbp_reply_forum_id', __( '<strong>Error</strong>: Forum ID is missing.', 'bbpress' ) );
    208208
    209209        // Forum id is not a number
    210210        } elseif ( ! is_numeric( $_POST['bbp_forum_id'] ) ) {
    211             bbp_add_error( 'bbp_reply_forum_id', __( '<strong>ERROR</strong>: Forum ID must be a number.', 'bbpress' ) );
     211            bbp_add_error( 'bbp_reply_forum_id', __( '<strong>Error</strong>: Forum ID must be a number.', 'bbpress' ) );
    212212
    213213        // Forum id might be valid
     
    219219            // Forum id is empty
    220220            if ( 0 === $posted_forum_id ) {
    221                 bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum ID is missing.', 'bbpress' ) );
     221                bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum ID is missing.', 'bbpress' ) );
    222222
    223223            // Forum id is a negative number
    224224            } elseif ( 0 > $posted_forum_id ) {
    225                 bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum ID cannot be a negative number.', 'bbpress' ) );
     225                bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum ID cannot be a negative number.', 'bbpress' ) );
    226226
    227227            // Forum does not exist
    228228            } elseif ( ! bbp_get_forum( $posted_forum_id ) ) {
    229                 bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum does not exist.', 'bbpress' ) );
     229                bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum does not exist.', 'bbpress' ) );
    230230
    231231            // Use the POST'ed forum id
     
    241241        // Forum is a category
    242242        if ( bbp_is_forum_category( $forum_id ) ) {
    243             bbp_add_error( 'bbp_new_reply_forum_category', __( '<strong>ERROR</strong>: This forum is a category. No replies can be created in this forum.', 'bbpress' ) );
     243            bbp_add_error( 'bbp_new_reply_forum_category', __( '<strong>Error</strong>: This forum is a category. No replies can be created in this forum.', 'bbpress' ) );
    244244
    245245        // Forum is not a category
     
    248248            // Forum is closed and user cannot access
    249249            if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) {
    250                 bbp_add_error( 'bbp_new_reply_forum_closed', __( '<strong>ERROR</strong>: This forum has been closed to new replies.', 'bbpress' ) );
     250                bbp_add_error( 'bbp_new_reply_forum_closed', __( '<strong>Error</strong>: This forum has been closed to new replies.', 'bbpress' ) );
    251251            }
    252252
    253253            // Forum is private and user cannot access
    254254            if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
    255                 bbp_add_error( 'bbp_new_reply_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
     255                bbp_add_error( 'bbp_new_reply_forum_private', __( '<strong>Error</strong>: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
    256256
    257257            // Forum is hidden and user cannot access
    258258            } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
    259                 bbp_add_error( 'bbp_new_reply_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
     259                bbp_add_error( 'bbp_new_reply_forum_hidden', __( '<strong>Error</strong>: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
    260260            }
    261261        }
     
    282282    // Title too long
    283283    if ( bbp_is_title_too_long( $reply_title ) ) {
    284         bbp_add_error( 'bbp_reply_title', __( '<strong>ERROR</strong>: Your title is too long.', 'bbpress' ) );
     284        bbp_add_error( 'bbp_reply_title', __( '<strong>Error</strong>: Your title is too long.', 'bbpress' ) );
    285285    }
    286286
     
    296296    // No reply content
    297297    if ( empty( $reply_content ) ) {
    298         bbp_add_error( 'bbp_reply_content', __( '<strong>ERROR</strong>: Your reply cannot be empty.', 'bbpress' ) );
     298        bbp_add_error( 'bbp_reply_content', __( '<strong>Error</strong>: Your reply cannot be empty.', 'bbpress' ) );
    299299    }
    300300
     
    302302
    303303    if ( ! bbp_check_for_flood( $anonymous_data, $reply_author ) ) {
    304         bbp_add_error( 'bbp_reply_flood', __( '<strong>ERROR</strong>: Slow down; you move too fast.', 'bbpress' ) );
     304        bbp_add_error( 'bbp_reply_flood', __( '<strong>Error</strong>: Slow down; you move too fast.', 'bbpress' ) );
    305305    }
    306306
     
    308308
    309309    if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_reply_post_type(), 'post_author' => $reply_author, 'post_content' => $reply_content, 'post_parent' => $topic_id, 'anonymous_data' => $anonymous_data ) ) ) {
    310         bbp_add_error( 'bbp_reply_duplicate', __( '<strong>ERROR</strong>: Duplicate reply detected; it looks as though you&#8217;ve already said that.', 'bbpress' ) );
     310        bbp_add_error( 'bbp_reply_duplicate', __( '<strong>Error</strong>: Duplicate reply detected; it looks as though you&#8217;ve already said that.', 'bbpress' ) );
    311311    }
    312312
     
    314314
    315315    if ( ! bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content, true ) ) {
    316         bbp_add_error( 'bbp_reply_moderation', __( '<strong>ERROR</strong>: Your reply cannot be created at this time.', 'bbpress' ) );
     316        bbp_add_error( 'bbp_reply_moderation', __( '<strong>Error</strong>: Your reply cannot be created at this time.', 'bbpress' ) );
    317317    }
    318318
     
    339339    // If topic is closed, moderators can still reply
    340340    if ( bbp_is_topic_closed( $topic_id ) && ! current_user_can( 'moderate', $topic_id ) ) {
    341         bbp_add_error( 'bbp_reply_topic_closed', __( '<strong>ERROR</strong>: Topic is closed.', 'bbpress' ) );
     341        bbp_add_error( 'bbp_reply_topic_closed', __( '<strong>Error</strong>: Topic is closed.', 'bbpress' ) );
    342342    }
    343343
     
    399399        // Term error
    400400        if ( is_wp_error( $terms ) ) {
    401             bbp_add_error( 'bbp_reply_tags', __( '<strong>ERROR</strong>: There was a problem adding the tags to the topic.', 'bbpress' ) );
     401            bbp_add_error( 'bbp_reply_tags', __( '<strong>Error</strong>: There was a problem adding the tags to the topic.', 'bbpress' ) );
    402402        }
    403403
     
    472472    // WP_Error
    473473    } elseif ( is_wp_error( $reply_id ) ) {
    474         bbp_add_error( 'bbp_reply_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) occurred: %s', 'bbpress' ), $reply_id->get_error_message() ) );
     474        bbp_add_error( 'bbp_reply_error', sprintf( __( '<strong>Error</strong>: The following problem(s) occurred: %s', 'bbpress' ), $reply_id->get_error_message() ) );
    475475
    476476    // Generic error
    477477    } else {
    478         bbp_add_error( 'bbp_reply_error', __( '<strong>ERROR</strong>: The reply was not created.', 'bbpress' ) );
     478        bbp_add_error( 'bbp_reply_error', __( '<strong>Error</strong>: The reply was not created.', 'bbpress' ) );
    479479    }
    480480}
     
    504504    // Reply id was not passed
    505505    if ( empty( $_POST['bbp_reply_id'] ) ) {
    506         bbp_add_error( 'bbp_edit_reply_id', __( '<strong>ERROR</strong>: Reply ID not found.', 'bbpress' ) );
     506        bbp_add_error( 'bbp_edit_reply_id', __( '<strong>Error</strong>: Reply ID not found.', 'bbpress' ) );
    507507        return;
    508508
     
    515515    // Nonce check
    516516    if ( ! bbp_verify_nonce_request( 'bbp-edit-reply_' . $reply_id ) ) {
    517         bbp_add_error( 'bbp_edit_reply_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     517        bbp_add_error( 'bbp_edit_reply_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    518518        return;
    519519    }
     
    521521    // Reply does not exist
    522522    if ( empty( $reply ) ) {
    523         bbp_add_error( 'bbp_edit_reply_not_found', __( '<strong>ERROR</strong>: The reply you want to edit was not found.', 'bbpress' ) );
     523        bbp_add_error( 'bbp_edit_reply_not_found', __( '<strong>Error</strong>: The reply you want to edit was not found.', 'bbpress' ) );
    524524        return;
    525525
     
    532532            // User cannot edit this reply
    533533            if ( ! current_user_can( 'edit_reply', $reply_id ) ) {
    534                 bbp_add_error( 'bbp_edit_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that reply.', 'bbpress' ) );
     534                bbp_add_error( 'bbp_edit_reply_permission', __( '<strong>Error</strong>: You do not have permission to edit that reply.', 'bbpress' ) );
    535535                return;
    536536            }
     
    567567        // Forum is a category
    568568        if ( bbp_is_forum_category( $forum_id ) ) {
    569             bbp_add_error( 'bbp_edit_reply_forum_category', __( '<strong>ERROR</strong>: This forum is a category. No replies can be created in this forum.', 'bbpress' ) );
     569            bbp_add_error( 'bbp_edit_reply_forum_category', __( '<strong>Error</strong>: This forum is a category. No replies can be created in this forum.', 'bbpress' ) );
    570570
    571571        // Forum is not a category
     
    574574            // Forum is closed and user cannot access
    575575            if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) {
    576                 bbp_add_error( 'bbp_edit_reply_forum_closed', __( '<strong>ERROR</strong>: This forum has been closed to new replies.', 'bbpress' ) );
     576                bbp_add_error( 'bbp_edit_reply_forum_closed', __( '<strong>Error</strong>: This forum has been closed to new replies.', 'bbpress' ) );
    577577            }
    578578
    579579            // Forum is private and user cannot access
    580580            if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
    581                 bbp_add_error( 'bbp_edit_reply_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
     581                bbp_add_error( 'bbp_edit_reply_forum_private', __( '<strong>Error</strong>: This forum is private and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
    582582
    583583            // Forum is hidden and user cannot access
    584584            } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
    585                 bbp_add_error( 'bbp_edit_reply_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
     585                bbp_add_error( 'bbp_edit_reply_forum_hidden', __( '<strong>Error</strong>: This forum is hidden and you do not have the capability to read or create new replies in it.', 'bbpress' ) );
    586586            }
    587587        }
     
    599599    // Title too long
    600600    if ( bbp_is_title_too_long( $reply_title ) ) {
    601         bbp_add_error( 'bbp_reply_title', __( '<strong>ERROR</strong>: Your title is too long.', 'bbpress' ) );
     601        bbp_add_error( 'bbp_reply_title', __( '<strong>Error</strong>: Your title is too long.', 'bbpress' ) );
    602602    }
    603603
     
    613613    // No reply content
    614614    if ( empty( $reply_content ) ) {
    615         bbp_add_error( 'bbp_edit_reply_content', __( '<strong>ERROR</strong>: Your reply cannot be empty.', 'bbpress' ) );
     615        bbp_add_error( 'bbp_edit_reply_content', __( '<strong>Error</strong>: Your reply cannot be empty.', 'bbpress' ) );
    616616    }
    617617
     
    619619
    620620    if ( ! bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content, true ) ) {
    621         bbp_add_error( 'bbp_reply_moderation', __( '<strong>ERROR</strong>: Your reply cannot be edited at this time.', 'bbpress' ) );
     621        bbp_add_error( 'bbp_reply_moderation', __( '<strong>Error</strong>: Your reply cannot be edited at this time.', 'bbpress' ) );
    622622    }
    623623
     
    709709    // Term error
    710710    if ( is_wp_error( $terms ) ) {
    711         bbp_add_error( 'bbp_reply_tags', __( '<strong>ERROR</strong>: There was a problem adding the tags to the topic.', 'bbpress' ) );
     711        bbp_add_error( 'bbp_reply_tags', __( '<strong>Error</strong>: There was a problem adding the tags to the topic.', 'bbpress' ) );
    712712    }
    713713
     
    767767    } else {
    768768        $append_error = ( is_wp_error( $reply_id ) && $reply_id->get_error_message() ) ? $reply_id->get_error_message() . ' ' : '';
    769         bbp_add_error( 'bbp_reply_error', __( '<strong>ERROR</strong>: The following problem(s) have been found with your reply:' . $append_error . 'Please try again.', 'bbpress' ) );
     769        bbp_add_error( 'bbp_reply_error', __( '<strong>Error</strong>: The following problem(s) have been found with your reply:' . $append_error . 'Please try again.', 'bbpress' ) );
    770770    }
    771771}
     
    12121212
    12131213    if ( empty( $_POST['bbp_reply_id'] ) ) {
    1214         bbp_add_error( 'bbp_move_reply_reply_id', __( '<strong>ERROR</strong>: A reply ID is required', 'bbpress' ) );
     1214        bbp_add_error( 'bbp_move_reply_reply_id', __( '<strong>Error</strong>: A reply ID is required', 'bbpress' ) );
    12151215    } else {
    12161216        $move_reply_id = (int) $_POST['bbp_reply_id'];
     
    12211221    // Reply exists
    12221222    if ( empty( $move_reply ) ) {
    1223         bbp_add_error( 'bbp_mover_reply_r_not_found', __( '<strong>ERROR</strong>: The reply you want to move was not found.', 'bbpress' ) );
     1223        bbp_add_error( 'bbp_mover_reply_r_not_found', __( '<strong>Error</strong>: The reply you want to move was not found.', 'bbpress' ) );
    12241224    }
    12251225
     
    12311231    // No topic
    12321232    if ( empty( $source_topic ) ) {
    1233         bbp_add_error( 'bbp_move_reply_source_not_found', __( '<strong>ERROR</strong>: The topic you want to move from was not found.', 'bbpress' ) );
     1233        bbp_add_error( 'bbp_move_reply_source_not_found', __( '<strong>Error</strong>: The topic you want to move from was not found.', 'bbpress' ) );
    12341234    }
    12351235
    12361236    // Nonce check failed
    12371237    if ( ! bbp_verify_nonce_request( 'bbp-move-reply_' . $move_reply->ID ) ) {
    1238         bbp_add_error( 'bbp_move_reply_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     1238        bbp_add_error( 'bbp_move_reply_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    12391239        return;
    12401240    }
     
    12421242    // Use cannot edit topic
    12431243    if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) {
    1244         bbp_add_error( 'bbp_move_reply_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
     1244        bbp_add_error( 'bbp_move_reply_source_permission', __( '<strong>Error</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
    12451245    }
    12461246
     
    12521252    // Invalid move option
    12531253    if ( empty( $move_option ) || ! in_array( $move_option, array( 'existing', 'topic' ), true ) ) {
    1254         bbp_add_error( 'bbp_move_reply_option', __( '<strong>ERROR</strong>: You need to choose a valid move option.', 'bbpress' ) );
     1254        bbp_add_error( 'bbp_move_reply_option', __( '<strong>Error</strong>: You need to choose a valid move option.', 'bbpress' ) );
    12551255
    12561256    // Valid move option
     
    12651265                // Get destination topic id
    12661266                if ( empty( $_POST['bbp_destination_topic'] ) ) {
    1267                     bbp_add_error( 'bbp_move_reply_destination_id', __( '<strong>ERROR</strong>: A topic ID is required.', 'bbpress' ) );
     1267                    bbp_add_error( 'bbp_move_reply_destination_id', __( '<strong>Error</strong>: A topic ID is required.', 'bbpress' ) );
    12681268                } else {
    12691269                    $destination_topic_id = (int) $_POST['bbp_destination_topic'];
     
    12751275                // No destination topic
    12761276                if ( empty( $destination_topic ) ) {
    1277                     bbp_add_error( 'bbp_move_reply_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to move to was not found.', 'bbpress' ) );
     1277                    bbp_add_error( 'bbp_move_reply_destination_not_found', __( '<strong>Error</strong>: The topic you want to move to was not found.', 'bbpress' ) );
    12781278                }
    12791279
    12801280                // User cannot edit the destination topic
    12811281                if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) {
    1282                     bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
     1282                    bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>Error</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
    12831283                }
    12841284
     
    13341334                    // Shouldn't happen
    13351335                    if ( false === $destination_topic_id || is_wp_error( $destination_topic_id ) || empty( $destination_topic ) ) {
    1336                         bbp_add_error( 'bbp_move_reply_destination_reply', __( '<strong>ERROR</strong>: There was a problem converting the reply into the topic. Please try again.', 'bbpress' ) );
     1336                        bbp_add_error( 'bbp_move_reply_destination_reply', __( '<strong>Error</strong>: There was a problem converting the reply into the topic. Please try again.', 'bbpress' ) );
    13371337                    }
    13381338
    13391339                // User cannot publish posts
    13401340                } else {
    1341                     bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) );
     1341                    bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>Error</strong>: You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) );
    13421342                }
    13431343
     
    14871487    $reply = bbp_get_reply( $reply_id );
    14881488    if ( empty( $reply ) ) {
    1489         bbp_add_error( 'bbp_toggle_reply_missing', __( '<strong>ERROR</strong>: This reply could not be found or no longer exists.', 'bbpress' ) );
     1489        bbp_add_error( 'bbp_toggle_reply_missing', __( '<strong>Error</strong>: This reply could not be found or no longer exists.', 'bbpress' ) );
    14901490        return;
    14911491    }
     
    14931493    // What is the user doing here?
    14941494    if ( ! current_user_can( 'edit_reply', $reply_id ) || ( 'bbp_toggle_reply_trash' === $action && ! current_user_can( 'delete_reply', $reply_id ) ) ) {
    1495         bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to do that.', 'bbpress' ) );
     1495        bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>Error</strong>: You do not have permission to do that.', 'bbpress' ) );
    14961496        return;
    14971497    }
     
    15691569            $is_approve         = bbp_is_reply_pending( $r['id'] );
    15701570            $retval['status']   = $is_approve ? bbp_approve_reply( $r['id'] ) : bbp_unapprove_reply( $r['id'] );
    1571             $retval['message']  = $is_approve ? __( '<strong>ERROR</strong>: There was a problem approving the reply.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem unapproving the reply.', 'bbpress' );
     1571            $retval['message']  = $is_approve ? __( '<strong>Error</strong>: There was a problem approving the reply.', 'bbpress' ) : __( '<strong>Error</strong>: There was a problem unapproving the reply.', 'bbpress' );
    15721572            $retval['view_all'] = ! $is_approve;
    15731573
     
    15801580            $is_spam            = bbp_is_reply_spam( $r['id'] );
    15811581            $retval['status']   = $is_spam ? bbp_unspam_reply( $r['id'] ) : bbp_spam_reply( $r['id'] );
    1582             $retval['message']  = $is_spam ? __( '<strong>ERROR</strong>: There was a problem unmarking the reply as spam.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem marking the reply as spam.', 'bbpress' );
     1582            $retval['message']  = $is_spam ? __( '<strong>Error</strong>: There was a problem unmarking the reply as spam.', 'bbpress' ) : __( '<strong>Error</strong>: There was a problem marking the reply as spam.', 'bbpress' );
    15831583            $retval['view_all'] = ! $is_spam;
    15841584
     
    15951595                    $retval['view_all'] = true;
    15961596                    $retval['status']   = wp_trash_post( $r['id'] );
    1597                     $retval['message']  = __( '<strong>ERROR</strong>: There was a problem trashing the reply.', 'bbpress' );
     1597                    $retval['message']  = __( '<strong>Error</strong>: There was a problem trashing the reply.', 'bbpress' );
    15981598
    15991599                    break;
     
    16031603
    16041604                    $retval['status']  = wp_untrash_post( $r['id'] );
    1605                     $retval['message'] = __( '<strong>ERROR</strong>: There was a problem untrashing the reply.', 'bbpress' );
     1605                    $retval['message'] = __( '<strong>Error</strong>: There was a problem untrashing the reply.', 'bbpress' );
    16061606
    16071607                    break;
     
    16111611
    16121612                    $retval['status']  = wp_delete_post( $r['id'] );
    1613                     $retval['message'] = __( '<strong>ERROR</strong>: There was a problem deleting the reply.', 'bbpress' );
     1613                    $retval['message'] = __( '<strong>Error</strong>: There was a problem deleting the reply.', 'bbpress' );
    16141614
    16151615                    break;
  • branches/2.6/src/includes/topics/functions.php

    r7036 r7097  
    103103    // Nonce check
    104104    if ( ! bbp_verify_nonce_request( 'bbp-new-topic' ) ) {
    105         bbp_add_error( 'bbp_new_topic_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     105        bbp_add_error( 'bbp_new_topic_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    106106        return;
    107107    }
     
    130130        // User cannot create topics
    131131        if ( ! current_user_can( 'publish_topics' ) ) {
    132             bbp_add_error( 'bbp_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to create new topics.', 'bbpress' ) );
     132            bbp_add_error( 'bbp_topic_permission', __( '<strong>Error</strong>: You do not have permission to create new topics.', 'bbpress' ) );
    133133            return;
    134134        }
     
    156156    // No topic title
    157157    if ( empty( $topic_title ) ) {
    158         bbp_add_error( 'bbp_topic_title', __( '<strong>ERROR</strong>: Your topic needs a title.', 'bbpress' ) );
     158        bbp_add_error( 'bbp_topic_title', __( '<strong>Error</strong>: Your topic needs a title.', 'bbpress' ) );
    159159    }
    160160
    161161    // Title too long
    162162    if ( bbp_is_title_too_long( $topic_title ) ) {
    163         bbp_add_error( 'bbp_topic_title', __( '<strong>ERROR</strong>: Your title is too long.', 'bbpress' ) );
     163        bbp_add_error( 'bbp_topic_title', __( '<strong>Error</strong>: Your title is too long.', 'bbpress' ) );
    164164    }
    165165
     
    175175    // No topic content
    176176    if ( empty( $topic_content ) ) {
    177         bbp_add_error( 'bbp_topic_content', __( '<strong>ERROR</strong>: Your topic cannot be empty.', 'bbpress' ) );
     177        bbp_add_error( 'bbp_topic_content', __( '<strong>Error</strong>: Your topic cannot be empty.', 'bbpress' ) );
    178178    }
    179179
     
    185185        // Empty Forum id was passed
    186186        if ( empty( $_POST['bbp_forum_id'] ) ) {
    187             bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum ID is missing.', 'bbpress' ) );
     187            bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum ID is missing.', 'bbpress' ) );
    188188
    189189        // Forum id is not a number
    190190        } elseif ( ! is_numeric( $_POST['bbp_forum_id'] ) ) {
    191             bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum ID must be a number.', 'bbpress' ) );
     191            bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum ID must be a number.', 'bbpress' ) );
    192192
    193193        // Forum id might be valid
     
    199199            // Forum id is empty
    200200            if ( 0 === $posted_forum_id ) {
    201                 bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum ID is missing.', 'bbpress' ) );
     201                bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum ID is missing.', 'bbpress' ) );
    202202
    203203            // Forum id is a negative number
    204204            } elseif ( 0 > $posted_forum_id ) {
    205                 bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum ID cannot be a negative number.', 'bbpress' ) );
     205                bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum ID cannot be a negative number.', 'bbpress' ) );
    206206
    207207            // Forum does not exist
    208208            } elseif ( ! bbp_get_forum( $posted_forum_id ) ) {
    209                 bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum does not exist.', 'bbpress' ) );
     209                bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum does not exist.', 'bbpress' ) );
    210210
    211211            // Use the POST'ed forum id
     
    221221        // Forum is a category
    222222        if ( bbp_is_forum_category( $forum_id ) ) {
    223             bbp_add_error( 'bbp_new_topic_forum_category', __( '<strong>ERROR</strong>: This forum is a category. No topics can be created in this forum.', 'bbpress' ) );
     223            bbp_add_error( 'bbp_new_topic_forum_category', __( '<strong>Error</strong>: This forum is a category. No topics can be created in this forum.', 'bbpress' ) );
    224224
    225225        // Forum is not a category
     
    228228            // Forum is closed and user cannot access
    229229            if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) {
    230                 bbp_add_error( 'bbp_new_topic_forum_closed', __( '<strong>ERROR</strong>: This forum has been closed to new topics.', 'bbpress' ) );
     230                bbp_add_error( 'bbp_new_topic_forum_closed', __( '<strong>Error</strong>: This forum has been closed to new topics.', 'bbpress' ) );
    231231            }
    232232
    233233            // Forum is private and user cannot access
    234234            if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
    235                 bbp_add_error( 'bbp_new_topic_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new topics in it.', 'bbpress' ) );
     235                bbp_add_error( 'bbp_new_topic_forum_private', __( '<strong>Error</strong>: This forum is private and you do not have the capability to read or create new topics in it.', 'bbpress' ) );
    236236
    237237            // Forum is hidden and user cannot access
    238238            } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
    239                 bbp_add_error( 'bbp_new_topic_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new topics in it.', 'bbpress' ) );
     239                bbp_add_error( 'bbp_new_topic_forum_hidden', __( '<strong>Error</strong>: This forum is hidden and you do not have the capability to read or create new topics in it.', 'bbpress' ) );
    240240            }
    241241        }
     
    245245
    246246    if ( ! bbp_check_for_flood( $anonymous_data, $topic_author ) ) {
    247         bbp_add_error( 'bbp_topic_flood', __( '<strong>ERROR</strong>: Slow down; you move too fast.', 'bbpress' ) );
     247        bbp_add_error( 'bbp_topic_flood', __( '<strong>Error</strong>: Slow down; you move too fast.', 'bbpress' ) );
    248248    }
    249249
     
    251251
    252252    if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_topic_post_type(), 'post_author' => $topic_author, 'post_content' => $topic_content, 'anonymous_data' => $anonymous_data ) ) ) {
    253         bbp_add_error( 'bbp_topic_duplicate', __( '<strong>ERROR</strong>: Duplicate topic detected; it looks as though you&#8217;ve already said that.', 'bbpress' ) );
     253        bbp_add_error( 'bbp_topic_duplicate', __( '<strong>Error</strong>: Duplicate topic detected; it looks as though you&#8217;ve already said that.', 'bbpress' ) );
    254254    }
    255255
     
    257257
    258258    if ( ! bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content, true ) ) {
    259         bbp_add_error( 'bbp_topic_moderation', __( '<strong>ERROR</strong>: Your topic cannot be created at this time.', 'bbpress' ) );
     259        bbp_add_error( 'bbp_topic_moderation', __( '<strong>Error</strong>: Your topic cannot be created at this time.', 'bbpress' ) );
    260260    }
    261261
     
    398398    // WP_Error
    399399    } elseif ( is_wp_error( $topic_id ) ) {
    400         bbp_add_error( 'bbp_topic_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) occurred: %s', 'bbpress' ), $topic_id->get_error_message() ) );
     400        bbp_add_error( 'bbp_topic_error', sprintf( __( '<strong>Error</strong>: The following problem(s) occurred: %s', 'bbpress' ), $topic_id->get_error_message() ) );
    401401
    402402    // Generic error
    403403    } else {
    404         bbp_add_error( 'bbp_topic_error', __( '<strong>ERROR</strong>: The topic was not created.', 'bbpress' ) );
     404        bbp_add_error( 'bbp_topic_error', __( '<strong>Error</strong>: The topic was not created.', 'bbpress' ) );
    405405    }
    406406}
     
    428428    // Topic id was not passed
    429429    if ( empty( $_POST['bbp_topic_id'] ) ) {
    430         bbp_add_error( 'bbp_edit_topic_id', __( '<strong>ERROR</strong>: Topic ID not found.', 'bbpress' ) );
     430        bbp_add_error( 'bbp_edit_topic_id', __( '<strong>Error</strong>: Topic ID not found.', 'bbpress' ) );
    431431        return;
    432432
     
    439439    // Topic does not exist
    440440    if ( empty( $topic ) ) {
    441         bbp_add_error( 'bbp_edit_topic_not_found', __( '<strong>ERROR</strong>: The topic you want to edit was not found.', 'bbpress' ) );
     441        bbp_add_error( 'bbp_edit_topic_not_found', __( '<strong>Error</strong>: The topic you want to edit was not found.', 'bbpress' ) );
    442442        return;
    443443
     
    450450            // User cannot edit this topic
    451451            if ( ! current_user_can( 'edit_topic', $topic_id ) ) {
    452                 bbp_add_error( 'bbp_edit_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that topic.', 'bbpress' ) );
     452                bbp_add_error( 'bbp_edit_topic_permission', __( '<strong>Error</strong>: You do not have permission to edit that topic.', 'bbpress' ) );
    453453            }
    454454
     
    466466    // Nonce check
    467467    if ( ! bbp_verify_nonce_request( 'bbp-edit-topic_' . $topic_id ) ) {
    468         bbp_add_error( 'bbp_edit_topic_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     468        bbp_add_error( 'bbp_edit_topic_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    469469        return;
    470470    }
     
    481481    // Forum id was not passed
    482482    if ( empty( $_POST['bbp_forum_id'] ) ) {
    483         bbp_add_error( 'bbp_topic_forum_id', __( '<strong>ERROR</strong>: Forum ID is missing.', 'bbpress' ) );
     483        bbp_add_error( 'bbp_topic_forum_id', __( '<strong>Error</strong>: Forum ID is missing.', 'bbpress' ) );
    484484
    485485    // Forum id was passed
     
    496496        // Forum is a category
    497497        if ( bbp_is_forum_category( $forum_id ) ) {
    498             bbp_add_error( 'bbp_edit_topic_forum_category', __( '<strong>ERROR</strong>: This forum is a category. No topics can be created in it.', 'bbpress' ) );
     498            bbp_add_error( 'bbp_edit_topic_forum_category', __( '<strong>Error</strong>: This forum is a category. No topics can be created in it.', 'bbpress' ) );
    499499
    500500        // Forum is not a category
     
    503503            // Forum is closed and user cannot access
    504504            if ( bbp_is_forum_closed( $forum_id ) && ! current_user_can( 'edit_forum', $forum_id ) ) {
    505                 bbp_add_error( 'bbp_edit_topic_forum_closed', __( '<strong>ERROR</strong>: This forum has been closed to new topics.', 'bbpress' ) );
     505                bbp_add_error( 'bbp_edit_topic_forum_closed', __( '<strong>Error</strong>: This forum has been closed to new topics.', 'bbpress' ) );
    506506            }
    507507
    508508            // Forum is private and user cannot access
    509509            if ( bbp_is_forum_private( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
    510                 bbp_add_error( 'bbp_edit_topic_forum_private', __( '<strong>ERROR</strong>: This forum is private and you do not have the capability to read or create new topics in it.', 'bbpress' ) );
     510                bbp_add_error( 'bbp_edit_topic_forum_private', __( '<strong>Error</strong>: This forum is private and you do not have the capability to read or create new topics in it.', 'bbpress' ) );
    511511
    512512            // Forum is hidden and user cannot access
    513513            } elseif ( bbp_is_forum_hidden( $forum_id ) && ! current_user_can( 'read_forum', $forum_id ) ) {
    514                 bbp_add_error( 'bbp_edit_topic_forum_hidden', __( '<strong>ERROR</strong>: This forum is hidden and you do not have the capability to read or create new topics in it.', 'bbpress' ) );
     514                bbp_add_error( 'bbp_edit_topic_forum_hidden', __( '<strong>Error</strong>: This forum is hidden and you do not have the capability to read or create new topics in it.', 'bbpress' ) );
    515515            }
    516516        }
     
    528528    // No topic title
    529529    if ( empty( $topic_title ) ) {
    530         bbp_add_error( 'bbp_edit_topic_title', __( '<strong>ERROR</strong>: Your topic needs a title.', 'bbpress' ) );
     530        bbp_add_error( 'bbp_edit_topic_title', __( '<strong>Error</strong>: Your topic needs a title.', 'bbpress' ) );
    531531    }
    532532
    533533    // Title too long
    534534    if ( bbp_is_title_too_long( $topic_title ) ) {
    535         bbp_add_error( 'bbp_topic_title', __( '<strong>ERROR</strong>: Your title is too long.', 'bbpress' ) );
     535        bbp_add_error( 'bbp_topic_title', __( '<strong>Error</strong>: Your title is too long.', 'bbpress' ) );
    536536    }
    537537
     
    547547    // No topic content
    548548    if ( empty( $topic_content ) ) {
    549         bbp_add_error( 'bbp_edit_topic_content', __( '<strong>ERROR</strong>: Your topic cannot be empty.', 'bbpress' ) );
     549        bbp_add_error( 'bbp_edit_topic_content', __( '<strong>Error</strong>: Your topic cannot be empty.', 'bbpress' ) );
    550550    }
    551551
     
    553553
    554554    if ( ! bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content, true ) ) {
    555         bbp_add_error( 'bbp_topic_moderation', __( '<strong>ERROR</strong>: Your topic cannot be edited at this time.', 'bbpress' ) );
     555        bbp_add_error( 'bbp_topic_moderation', __( '<strong>Error</strong>: Your topic cannot be edited at this time.', 'bbpress' ) );
    556556    }
    557557
     
    714714    } else {
    715715        $append_error = ( is_wp_error( $topic_id ) && $topic_id->get_error_message() ) ? $topic_id->get_error_message() . ' ' : '';
    716         bbp_add_error( 'bbp_topic_error', __( '<strong>ERROR</strong>: The following problem(s) have been found with your topic:' . $append_error . 'Please try again.', 'bbpress' ) );
     716        bbp_add_error( 'bbp_topic_error', __( '<strong>Error</strong>: The following problem(s) have been found with your topic:' . $append_error . 'Please try again.', 'bbpress' ) );
    717717    }
    718718}
     
    10831083    // Topic id
    10841084    if ( empty( $_POST['bbp_topic_id'] ) ) {
    1085         bbp_add_error( 'bbp_merge_topic_source_id', __( '<strong>ERROR</strong>: Topic ID not found.', 'bbpress' ) );
     1085        bbp_add_error( 'bbp_merge_topic_source_id', __( '<strong>Error</strong>: Topic ID not found.', 'bbpress' ) );
    10861086    } else {
    10871087        $source_topic_id = (int) $_POST['bbp_topic_id'];
     
    10901090    // Nonce check
    10911091    if ( ! bbp_verify_nonce_request( 'bbp-merge-topic_' . $source_topic_id ) ) {
    1092         bbp_add_error( 'bbp_merge_topic_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     1092        bbp_add_error( 'bbp_merge_topic_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    10931093        return;
    10941094
    10951095    // Source topic not found
    10961096    } elseif ( ! $source_topic = bbp_get_topic( $source_topic_id ) ) {
    1097         bbp_add_error( 'bbp_merge_topic_source_not_found', __( '<strong>ERROR</strong>: The topic you want to merge was not found.', 'bbpress' ) );
     1097        bbp_add_error( 'bbp_merge_topic_source_not_found', __( '<strong>Error</strong>: The topic you want to merge was not found.', 'bbpress' ) );
    10981098        return;
    10991099    }
     
    11011101    // Cannot edit source topic
    11021102    if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) {
    1103         bbp_add_error( 'bbp_merge_topic_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
     1103        bbp_add_error( 'bbp_merge_topic_source_permission', __( '<strong>Error</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
    11041104        return;
    11051105    }
     
    11091109    // Topic id
    11101110    if ( empty( $_POST['bbp_destination_topic'] ) ) {
    1111         bbp_add_error( 'bbp_merge_topic_destination_id', __( '<strong>ERROR</strong>: Destination topic ID not found.', 'bbpress' ) );
     1111        bbp_add_error( 'bbp_merge_topic_destination_id', __( '<strong>Error</strong>: Destination topic ID not found.', 'bbpress' ) );
    11121112    } else {
    11131113        $destination_topic_id = (int) $_POST['bbp_destination_topic'];
     
    11161116    // Destination topic not found
    11171117    if ( ! $destination_topic = bbp_get_topic( $destination_topic_id ) ) {
    1118         bbp_add_error( 'bbp_merge_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to merge to was not found.', 'bbpress' ) );
     1118        bbp_add_error( 'bbp_merge_topic_destination_not_found', __( '<strong>Error</strong>: The topic you want to merge to was not found.', 'bbpress' ) );
    11191119    }
    11201120
    11211121    // Cannot edit destination topic
    11221122    if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) {
    1123         bbp_add_error( 'bbp_merge_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
     1123        bbp_add_error( 'bbp_merge_topic_destination_permission', __( '<strong>Error</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
    11241124    }
    11251125
     
    13411341
    13421342    if ( empty( $_POST['bbp_reply_id'] ) ) {
    1343         bbp_add_error( 'bbp_split_topic_reply_id', __( '<strong>ERROR</strong>: A reply ID is required.', 'bbpress' ) );
     1343        bbp_add_error( 'bbp_split_topic_reply_id', __( '<strong>Error</strong>: A reply ID is required.', 'bbpress' ) );
    13441344    } else {
    13451345        $from_reply_id = (int) $_POST['bbp_reply_id'];
     
    13501350    // Reply exists
    13511351    if ( empty( $from_reply ) ) {
    1352         bbp_add_error( 'bbp_split_topic_r_not_found', __( '<strong>ERROR</strong>: The reply you want to split from was not found.', 'bbpress' ) );
     1352        bbp_add_error( 'bbp_split_topic_r_not_found', __( '<strong>Error</strong>: The reply you want to split from was not found.', 'bbpress' ) );
    13531353    }
    13541354
     
    13601360    // No topic
    13611361    if ( empty( $source_topic ) ) {
    1362         bbp_add_error( 'bbp_split_topic_source_not_found', __( '<strong>ERROR</strong>: The topic you want to split was not found.', 'bbpress' ) );
     1362        bbp_add_error( 'bbp_split_topic_source_not_found', __( '<strong>Error</strong>: The topic you want to split was not found.', 'bbpress' ) );
    13631363    }
    13641364
    13651365    // Nonce check failed
    13661366    if ( ! bbp_verify_nonce_request( 'bbp-split-topic_' . $source_topic->ID ) ) {
    1367         bbp_add_error( 'bbp_split_topic_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     1367        bbp_add_error( 'bbp_split_topic_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    13681368        return;
    13691369    }
     
    13711371    // Use cannot edit topic
    13721372    if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) {
    1373         bbp_add_error( 'bbp_split_topic_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
     1373        bbp_add_error( 'bbp_split_topic_source_permission', __( '<strong>Error</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
    13741374    }
    13751375
     
    13811381    // Invalid split option
    13821382    if ( empty( $split_option ) || ! in_array( $split_option, array( 'existing', 'reply' ), true ) ) {
    1383         bbp_add_error( 'bbp_split_topic_option', __( '<strong>ERROR</strong>: You need to choose a valid split option.', 'bbpress' ) );
     1383        bbp_add_error( 'bbp_split_topic_option', __( '<strong>Error</strong>: You need to choose a valid split option.', 'bbpress' ) );
    13841384
    13851385    // Valid Split Option
     
    13941394                // Get destination topic id
    13951395                if ( empty( $_POST['bbp_destination_topic'] ) ) {
    1396                     bbp_add_error( 'bbp_split_topic_destination_id', __( '<strong>ERROR</strong>: A topic ID is required.', 'bbpress' ) );
     1396                    bbp_add_error( 'bbp_split_topic_destination_id', __( '<strong>Error</strong>: A topic ID is required.', 'bbpress' ) );
    13971397                } else {
    13981398                    $destination_topic_id = (int) $_POST['bbp_destination_topic'];
     
    14041404                // No destination topic
    14051405                if ( empty( $destination_topic ) ) {
    1406                     bbp_add_error( 'bbp_split_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to split to was not found.', 'bbpress' ) );
     1406                    bbp_add_error( 'bbp_split_topic_destination_not_found', __( '<strong>Error</strong>: The topic you want to split to was not found.', 'bbpress' ) );
    14071407                }
    14081408
    14091409                // User cannot edit the destination topic
    14101410                if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) {
    1411                     bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
     1411                    bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>Error</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
    14121412                }
    14131413
     
    14471447                    // Shouldn't happen
    14481448                    if ( false === $destination_topic_id || is_wp_error( $destination_topic_id ) || empty( $destination_topic ) ) {
    1449                         bbp_add_error( 'bbp_split_topic_destination_reply', __( '<strong>ERROR</strong>: There was a problem converting the reply into the topic. Please try again.', 'bbpress' ) );
     1449                        bbp_add_error( 'bbp_split_topic_destination_reply', __( '<strong>Error</strong>: There was a problem converting the reply into the topic. Please try again.', 'bbpress' ) );
    14501450                    }
    14511451
    14521452                // User cannot publish posts
    14531453                } else {
    1454                     bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) );
     1454                    bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>Error</strong>: You do not have permission to create new topics. The reply could not be converted into a topic.', 'bbpress' ) );
    14551455                }
    14561456
     
    16891689    // Tag does not exist
    16901690    if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
    1691         bbp_add_error( 'bbp_manage_topic_invalid_tag', sprintf( __( '<strong>ERROR</strong>: The following problem(s) have been found while getting the tag: %s', 'bbpress' ), $tag->get_error_message() ) );
     1691        bbp_add_error( 'bbp_manage_topic_invalid_tag', sprintf( __( '<strong>Error</strong>: The following problem(s) have been found while getting the tag: %s', 'bbpress' ), $tag->get_error_message() ) );
    16921692        return;
    16931693    }
     
    17011701            // Nonce check
    17021702            if ( ! bbp_verify_nonce_request( 'update-tag_' . $tag_id ) ) {
    1703                 bbp_add_error( 'bbp_manage_topic_tag_update_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     1703                bbp_add_error( 'bbp_manage_topic_tag_update_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    17041704                return;
    17051705            }
     
    17071707            // Can user edit topic tags?
    17081708            if ( ! current_user_can( 'edit_topic_tag', $tag_id ) ) {
    1709                 bbp_add_error( 'bbp_manage_topic_tag_update_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) );
     1709                bbp_add_error( 'bbp_manage_topic_tag_update_permission', __( '<strong>Error</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) );
    17101710                return;
    17111711            }
     
    17131713            // No tag name was provided
    17141714            if ( empty( $_POST['tag-name'] ) || ! $name = $_POST['tag-name'] ) {
    1715                 bbp_add_error( 'bbp_manage_topic_tag_update_name', __( '<strong>ERROR</strong>: You need to enter a tag name.', 'bbpress' ) );
     1715                bbp_add_error( 'bbp_manage_topic_tag_update_name', __( '<strong>Error</strong>: You need to enter a tag name.', 'bbpress' ) );
    17161716                return;
    17171717            }
     
    17281728            // Cannot update tag
    17291729            if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
    1730                 bbp_add_error( 'bbp_manage_topic_tag_update_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) have been found while updating the tag: %s', 'bbpress' ), $tag->get_error_message() ) );
     1730                bbp_add_error( 'bbp_manage_topic_tag_update_error', sprintf( __( '<strong>Error</strong>: The following problem(s) have been found while updating the tag: %s', 'bbpress' ), $tag->get_error_message() ) );
    17311731                return;
    17321732            }
     
    17451745            // Nonce check
    17461746            if ( ! bbp_verify_nonce_request( 'merge-tag_' . $tag_id ) ) {
    1747                 bbp_add_error( 'bbp_manage_topic_tag_merge_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     1747                bbp_add_error( 'bbp_manage_topic_tag_merge_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    17481748                return;
    17491749            }
     
    17511751            // Can user edit topic tags?
    17521752            if ( ! current_user_can( 'edit_topic_tags' ) ) {
    1753                 bbp_add_error( 'bbp_manage_topic_tag_merge_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) );
     1753                bbp_add_error( 'bbp_manage_topic_tag_merge_permission', __( '<strong>Error</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) );
    17541754                return;
    17551755            }
     
    17571757            // No tag name was provided
    17581758            if ( empty( $_POST['tag-existing-name'] ) || ! $name = $_POST['tag-existing-name'] ) {
    1759                 bbp_add_error( 'bbp_manage_topic_tag_merge_name', __( '<strong>ERROR</strong>: You need to enter a tag name.', 'bbpress' ) );
     1759                bbp_add_error( 'bbp_manage_topic_tag_merge_name', __( '<strong>Error</strong>: You need to enter a tag name.', 'bbpress' ) );
    17601760                return;
    17611761            }
     
    17681768            // Problem inserting the new term
    17691769            if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
    1770                 bbp_add_error( 'bbp_manage_topic_tag_merge_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) have been found while merging the tags: %s', 'bbpress' ), $tag->get_error_message() ) );
     1770                bbp_add_error( 'bbp_manage_topic_tag_merge_error', sprintf( __( '<strong>Error</strong>: The following problem(s) have been found while merging the tags: %s', 'bbpress' ), $tag->get_error_message() ) );
    17711771                return;
    17721772            }
     
    17771777            // Attempting to merge a tag into itself
    17781778            if ( $tag_id === $to_tag ) {
    1779                 bbp_add_error( 'bbp_manage_topic_tag_merge_same', __( '<strong>ERROR</strong>: The tags which are being merged can not be the same.', 'bbpress' ) );
     1779                bbp_add_error( 'bbp_manage_topic_tag_merge_same', __( '<strong>Error</strong>: The tags which are being merged can not be the same.', 'bbpress' ) );
    17801780                return;
    17811781            }
     
    17891789            // Error merging the terms
    17901790            if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
    1791                 bbp_add_error( 'bbp_manage_topic_tag_merge_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) have been found while merging the tags: %s', 'bbpress' ), $tag->get_error_message() ) );
     1791                bbp_add_error( 'bbp_manage_topic_tag_merge_error', sprintf( __( '<strong>Error</strong>: The following problem(s) have been found while merging the tags: %s', 'bbpress' ), $tag->get_error_message() ) );
    17921792                return;
    17931793            }
     
    18061806            // Nonce check
    18071807            if ( ! bbp_verify_nonce_request( 'delete-tag_' . $tag_id ) ) {
    1808                 bbp_add_error( 'bbp_manage_topic_tag_delete_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     1808                bbp_add_error( 'bbp_manage_topic_tag_delete_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    18091809                return;
    18101810            }
     
    18121812            // Can user delete topic tags?
    18131813            if ( ! current_user_can( 'delete_topic_tag', $tag_id ) ) {
    1814                 bbp_add_error( 'bbp_manage_topic_tag_delete_permission', __( '<strong>ERROR</strong>: You do not have permission to delete the topic tags.', 'bbpress' ) );
     1814                bbp_add_error( 'bbp_manage_topic_tag_delete_permission', __( '<strong>Error</strong>: You do not have permission to delete the topic tags.', 'bbpress' ) );
    18151815                return;
    18161816            }
     
    18211821            // Error deleting term
    18221822            if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
    1823                 bbp_add_error( 'bbp_manage_topic_tag_delete_error', sprintf( __( '<strong>ERROR</strong>: The following problem(s) have been found while deleting the tag: %s', 'bbpress' ), $tag->get_error_message() ) );
     1823                bbp_add_error( 'bbp_manage_topic_tag_delete_error', sprintf( __( '<strong>Error</strong>: The following problem(s) have been found while deleting the tag: %s', 'bbpress' ), $tag->get_error_message() ) );
    18241824                return;
    18251825            }
     
    20172017    $topic = bbp_get_topic( $topic_id );
    20182018    if ( empty( $topic ) ) {
    2019         bbp_add_error( 'bbp_toggle_topic_missing', __( '<strong>ERROR</strong>: This topic could not be found or no longer exists.', 'bbpress' ) );
     2019        bbp_add_error( 'bbp_toggle_topic_missing', __( '<strong>Error</strong>: This topic could not be found or no longer exists.', 'bbpress' ) );
    20202020        return;
    20212021    }
     
    20232023    // What is the user doing here?
    20242024    if ( ! current_user_can( 'edit_topic', $topic_id ) || ( 'bbp_toggle_topic_trash' === $action && ! current_user_can( 'delete_topic', $topic_id ) ) ) {
    2025         bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to do that.', 'bbpress' ) );
     2025        bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>Error</strong>: You do not have permission to do that.', 'bbpress' ) );
    20262026        return;
    20272027    }
     
    21072107            // Feedback
    21082108            $retval['message'] = ( true === $is_pending )
    2109                 ? __( '<strong>ERROR</strong>: There was a problem approving the topic.',   'bbpress' )
    2110                 : __( '<strong>ERROR</strong>: There was a problem unapproving the topic.', 'bbpress' );
     2109                ? __( '<strong>Error</strong>: There was a problem approving the topic.',   'bbpress' )
     2110                : __( '<strong>Error</strong>: There was a problem unapproving the topic.', 'bbpress' );
    21112111
    21122112            break;
     
    21252125            // Feedback
    21262126            $retval['message'] = ( true === $is_open )
    2127                 ? __( '<strong>ERROR</strong>: There was a problem closing the topic.', 'bbpress' )
    2128                 : __( '<strong>ERROR</strong>: There was a problem opening the topic.', 'bbpress' );
     2127                ? __( '<strong>Error</strong>: There was a problem closing the topic.', 'bbpress' )
     2128                : __( '<strong>Error</strong>: There was a problem opening the topic.', 'bbpress' );
    21292129
    21302130            break;
     
    21442144            // Feedback
    21452145            $retval['message'] = ( true === $is_sticky )
    2146                 ? __( '<strong>ERROR</strong>: There was a problem unsticking the topic.', 'bbpress' )
    2147                 : __( '<strong>ERROR</strong>: There was a problem sticking the topic.',   'bbpress' );
     2146                ? __( '<strong>Error</strong>: There was a problem unsticking the topic.', 'bbpress' )
     2147                : __( '<strong>Error</strong>: There was a problem sticking the topic.',   'bbpress' );
    21482148
    21492149            break;
     
    21632163            // Feedback
    21642164            $retval['message'] = ( true === $is_spam )
    2165                 ? __( '<strong>ERROR</strong>: There was a problem unmarking the topic as spam.', 'bbpress' )
    2166                 : __( '<strong>ERROR</strong>: There was a problem marking the topic as spam.',   'bbpress' );
     2165                ? __( '<strong>Error</strong>: There was a problem unmarking the topic as spam.', 'bbpress' )
     2166                : __( '<strong>Error</strong>: There was a problem marking the topic as spam.',   'bbpress' );
    21672167
    21682168            break;
     
    21772177                    $retval['view_all']    = true;
    21782178                    $retval['status']      = wp_trash_post( $r['id'] );
    2179                     $retval['message']     = __( '<strong>ERROR</strong>: There was a problem trashing the topic.', 'bbpress' );
     2179                    $retval['message']     = __( '<strong>Error</strong>: There was a problem trashing the topic.', 'bbpress' );
    21802180                    $retval['redirect_to'] = current_user_can( 'view_trash' )
    21812181                        ? bbp_get_topic_permalink( $r['id'] )
     
    21882188
    21892189                    $retval['status']      = wp_untrash_post( $r['id'] );
    2190                     $retval['message']     = __( '<strong>ERROR</strong>: There was a problem untrashing the topic.', 'bbpress' );
     2190                    $retval['message']     = __( '<strong>Error</strong>: There was a problem untrashing the topic.', 'bbpress' );
    21912191                    $retval['redirect_to'] = bbp_get_topic_permalink( $r['id'] );
    21922192
     
    21972197
    21982198                    $retval['status']      = wp_delete_post( $r['id'] );
    2199                     $retval['message']     = __( '<strong>ERROR</strong>: There was a problem deleting the topic.', 'bbpress' );
     2199                    $retval['message']     = __( '<strong>Error</strong>: There was a problem deleting the topic.', 'bbpress' );
    22002200                    $retval['redirect_to'] = bbp_get_forum_permalink( $retval['status']->post_parent );
    22012201
  • branches/2.6/src/includes/users/engagements.php

    r7012 r7097  
    606606    // Check for empty topic
    607607    if ( empty( $topic_id ) ) {
    608         bbp_add_error( 'bbp_favorite_topic_id', __( '<strong>ERROR</strong>: No topic was found. Which topic are you marking/unmarking as favorite?', 'bbpress' ) );
     608        bbp_add_error( 'bbp_favorite_topic_id', __( '<strong>Error</strong>: No topic was found. Which topic are you marking/unmarking as favorite?', 'bbpress' ) );
    609609
    610610    // Check nonce
    611611    } elseif ( ! bbp_verify_nonce_request( 'toggle-favorite_' . $topic_id ) ) {
    612         bbp_add_error( 'bbp_favorite_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     612        bbp_add_error( 'bbp_favorite_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    613613
    614614    // Check current user's ability to edit the user
    615615    } elseif ( ! current_user_can( 'edit_user', $user_id ) ) {
    616         bbp_add_error( 'bbp_favorite_permission', __( '<strong>ERROR</strong>: You do not have permission to edit favorites for that user.', 'bbpress' ) );
     616        bbp_add_error( 'bbp_favorite_permission', __( '<strong>Error</strong>: You do not have permission to edit favorites for that user.', 'bbpress' ) );
    617617    }
    618618
     
    655655    // Fail! Handle errors
    656656    } elseif ( 'bbp_favorite_remove' === $action ) {
    657         bbp_add_error( 'bbp_favorite_remove', __( '<strong>ERROR</strong>: There was a problem removing that topic from favorites.', 'bbpress' ) );
     657        bbp_add_error( 'bbp_favorite_remove', __( '<strong>Error</strong>: There was a problem removing that topic from favorites.', 'bbpress' ) );
    658658    } elseif ( 'bbp_favorite_add' === $action ) {
    659         bbp_add_error( 'bbp_favorite_add',    __( '<strong>ERROR</strong>: There was a problem favoriting that topic.', 'bbpress' ) );
     659        bbp_add_error( 'bbp_favorite_add',    __( '<strong>Error</strong>: There was a problem favoriting that topic.', 'bbpress' ) );
    660660    }
    661661
     
    847847    // Check for empty topic
    848848    if ( empty( $object_id ) ) {
    849         bbp_add_error( 'bbp_subscription_object_id', __( '<strong>ERROR</strong>: Not found. What are you subscribing/unsubscribing to?', 'bbpress' ) );
     849        bbp_add_error( 'bbp_subscription_object_id', __( '<strong>Error</strong>: Not found. What are you subscribing/unsubscribing to?', 'bbpress' ) );
    850850
    851851    // Check nonce
    852852    } elseif ( ! bbp_verify_nonce_request( 'toggle-subscription_' . $object_id ) ) {
    853         bbp_add_error( 'bbp_subscription_object_id', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     853        bbp_add_error( 'bbp_subscription_object_id', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    854854
    855855    // Check current user's ability to edit the user
    856856    } elseif ( ! current_user_can( 'edit_user', $user_id ) ) {
    857         bbp_add_error( 'bbp_subscription_permission', __( '<strong>ERROR</strong>: You do not have permission to edit subscriptions of that user.', 'bbpress' ) );
     857        bbp_add_error( 'bbp_subscription_permission', __( '<strong>Error</strong>: You do not have permission to edit subscriptions of that user.', 'bbpress' ) );
    858858    }
    859859
     
    898898    // Fail! Handle errors
    899899    } elseif ( 'bbp_unsubscribe' === $action ) {
    900         bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing.', 'bbpress' ) );
     900        bbp_add_error( 'bbp_unsubscribe', __( '<strong>Error</strong>: There was a problem unsubscribing.', 'bbpress' ) );
    901901    } elseif ( 'bbp_subscribe' === $action ) {
    902         bbp_add_error( 'bbp_subscribe',   __( '<strong>ERROR</strong>: There was a problem subscribing.', 'bbpress' ) );
     902        bbp_add_error( 'bbp_subscribe',   __( '<strong>Error</strong>: There was a problem subscribing.', 'bbpress' ) );
    903903    }
    904904
  • branches/2.6/src/includes/users/functions.php

    r7031 r7097  
    194194    // Nonce check
    195195    if ( ! bbp_verify_nonce_request( 'update-user_' . $user_id ) ) {
    196         bbp_add_error( 'bbp_update_user_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     196        bbp_add_error( 'bbp_update_user_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    197197        return;
    198198    }
     
    200200    // Cap check
    201201    if ( ! current_user_can( 'edit_user', $user_id ) ) {
    202         bbp_add_error( 'bbp_update_user_capability', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     202        bbp_add_error( 'bbp_update_user_capability', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    203203        return;
    204204    }
     
    206206    // Empty email check
    207207    if ( empty( $_POST['email'] ) ) {
    208         bbp_add_error( 'bbp_user_email_empty', __( '<strong>ERROR</strong>: That is not a valid email address.', 'bbpress' ), array( 'form-field' => 'email' ) );
     208        bbp_add_error( 'bbp_user_email_empty', __( '<strong>Error</strong>: That is not a valid email address.', 'bbpress' ), array( 'form-field' => 'email' ) );
    209209        return;
    210210    }
     
    218218        // Check that new email address is valid
    219219        if ( ! is_email( $_POST['email'] ) ) {
    220             bbp_add_error( 'bbp_user_email_invalid', __( '<strong>ERROR</strong>: That is not a valid email address.', 'bbpress' ), array( 'form-field' => 'email' ) );
     220            bbp_add_error( 'bbp_user_email_invalid', __( '<strong>Error</strong>: That is not a valid email address.', 'bbpress' ), array( 'form-field' => 'email' ) );
    221221            return;
    222222        }
     
    224224        // Check if email address is already in use
    225225        if ( email_exists( $_POST['email'] ) ) {
    226             bbp_add_error( 'bbp_user_email_taken', __( '<strong>ERROR</strong>: That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) );
     226            bbp_add_error( 'bbp_user_email_taken', __( '<strong>Error</strong>: That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) );
    227227            return;
    228228        }
     
    341341                delete_user_meta( $user_id, $key );
    342342
    343                 bbp_add_error( 'bbp_user_email_taken', __( '<strong>ERROR</strong>: That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) );
     343                bbp_add_error( 'bbp_user_email_taken', __( '<strong>Error</strong>: That email address is already in use.', 'bbpress' ), array( 'form-field' => 'email' ) );
    344344
    345345            // Email address is good to change to
     
    378378    } elseif ( ! empty( $_GET['dismiss'] ) && ( "{$user_id}{$key}" === $_GET['dismiss'] ) ) {
    379379        if ( ! bbp_verify_nonce_request( "dismiss-{$user_id}{$key}" ) ) {
    380             bbp_add_error( 'bbp_dismiss_new_email_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
     380            bbp_add_error( 'bbp_dismiss_new_email_nonce', __( '<strong>Error</strong>: Are you sure you wanted to do that?', 'bbpress' ) );
    381381            return;
    382382        }
     
    404404    // Bail if any relevant parameters are empty
    405405    if ( empty( $user_id ) || empty( $r['hash'] ) || empty( $r['newemail'] ) ) {
    406         bbp_add_error( 'bbp_user_email_invalid_hash', __( '<strong>ERROR</strong>: An error occurred while updating your email address.', 'bbpress' ), array( 'form-field' => 'email' ) );
     406        bbp_add_error( 'bbp_user_email_invalid_hash', __( '<strong>Error</strong>: An error occurred while updating your email address.', 'bbpress' ), array( 'form-field' => 'email' ) );
    407407        return;
    408408    }
  • branches/2.6/src/includes/users/signups.php

    r7087 r7097  
    207207    // Add error if role is empty
    208208    if ( empty( $to_validate ) ) {
    209         bbp_add_error( 'bbp_signup_role_empty', __( '<strong>ERROR</strong>: Empty role.', 'bbpress' ) );
     209        bbp_add_error( 'bbp_signup_role_empty', __( '<strong>Error</strong>: Empty role.', 'bbpress' ) );
    210210    }
    211211
    212212    // Add error if posted role is not a valid role
    213213    if ( ! bbp_is_valid_role( $to_validate ) ) {
    214         bbp_add_error( 'bbp_signup_role_invalid', __( '<strong>ERROR</strong>: Invalid role.', 'bbpress' ) );
     214        bbp_add_error( 'bbp_signup_role_invalid', __( '<strong>Error</strong>: Invalid role.', 'bbpress' ) );
    215215    }
    216216
Note: See TracChangeset for help on using the changeset viewer.