Skip to:
Content

bbPress.org

Changeset 6141


Ignore:
Timestamp:
12/08/2016 04:14:17 PM (3 years ago)
Author:
johnjamesjacoby
Message:

Even less shouting, plus a grammar sweep.

  • Remove contractions
  • Update weird sounding English phrases (like "the permissions" to "permission")
  • Simplify some phrases to be less wordy
  • Update "permission" error codes to all use "permission" instead of also "permissions"
  • Add comma to "Oh bother!". See: https://www.youtube.com/watch?v=Fhl4oKvxphs
Location:
trunk/src
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/admin/forums.php

    r6140 r6141  
    493493            // Bail if forum is missing
    494494            if ( empty( $forum ) ) {
    495                 wp_die( __( 'The forum was not found!', 'bbpress' ) );
     495                wp_die( __( 'The forum was not found.', 'bbpress' ) );
    496496            }
    497497
    498498            // What is the user doing here?
    499499            if ( ! current_user_can( 'keep_gate', $forum->ID ) ) {
    500                 wp_die( __( 'You do not have the permission to do that.', 'bbpress' ) );
     500                wp_die( __( 'You do not have permission to do that.', 'bbpress' ) );
    501501            }
    502502
  • trunk/src/includes/admin/replies.php

    r6140 r6141  
    604604            $reply = bbp_get_reply( $reply_id );
    605605            if ( empty( $reply ) ) {
    606                 wp_die( __( 'The reply was not found!', 'bbpress' ) );
     606                wp_die( __( 'The reply was not found.', 'bbpress' ) );
    607607            }
    608608
    609609            // What is the user doing here?
    610610            if ( !current_user_can( 'moderate', $reply->ID ) ) {
    611                 wp_die( __( 'You do not have the permission to do that.', 'bbpress' ) );
     611                wp_die( __( 'You do not have permission to do that.', 'bbpress' ) );
    612612            }
    613613
  • trunk/src/includes/admin/tools.php

    r6091 r6141  
    20812081    $bbp_db    = bbp_db();
    20822082    $statement = __( 'Recalculating reply menu order … %s', 'bbpress' );
    2083     $result    = __( 'No reply positions to recalculate!',         'bbpress' );
     2083    $result    = __( 'No reply positions to recalculate.',         'bbpress' );
    20842084
    20852085    // Delete cases where `_bbp_reply_to` was accidentally set to itself
  • trunk/src/includes/admin/topics.php

    r6140 r6141  
    655655            // Bail if topic is missing
    656656            if ( empty( $topic ) ) {
    657                 wp_die( __( 'The topic was not found!', 'bbpress' ) );
     657                wp_die( __( 'The topic was not found.', 'bbpress' ) );
    658658            }
    659659
    660660            // What is the user doing here?
    661661            if ( !current_user_can( 'moderate', $topic->ID ) ) {
    662                 wp_die( __( 'You do not have the permission to do that.', 'bbpress' ) );
     662                wp_die( __( 'You do not have permission to do that.', 'bbpress' ) );
    663663            }
    664664
  • trunk/src/includes/common/functions.php

    r6135 r6141  
    651651    $r['bbp_anonymous_name'] = apply_filters( 'bbp_pre_anonymous_post_author_name',  $r['bbp_anonymous_name']  );
    652652    if ( empty( $r['bbp_anonymous_name'] ) ) {
    653         bbp_add_error( 'bbp_anonymous_name',  __( '<strong>ERROR</strong>: Invalid author name submitted!',   'bbpress' ) );
     653        bbp_add_error( 'bbp_anonymous_name',  __( '<strong>ERROR</strong>: Invalid author name.',   'bbpress' ) );
    654654    }
    655655
    656656    $r['bbp_anonymous_email'] = apply_filters( 'bbp_pre_anonymous_post_author_email', $r['bbp_anonymous_email'] );
    657657    if ( empty( $r['bbp_anonymous_email'] ) ) {
    658         bbp_add_error( 'bbp_anonymous_email', __( '<strong>ERROR</strong>: Invalid email address submitted!', 'bbpress' ) );
     658        bbp_add_error( 'bbp_anonymous_email', __( '<strong>ERROR</strong>: Invalid email address.', 'bbpress' ) );
    659659    }
    660660
  • trunk/src/includes/extend/buddypress/notifications.php

    r5951 r6141  
    166166    // Check current user's ability to edit the user
    167167    } elseif ( !current_user_can( 'edit_user', $user_id ) ) {
    168         bbp_add_error( 'bbp_notification_permissions', __( '<strong>ERROR</strong>: You do not have permission to mark notifications for that user.', 'bbpress' ) );
     168        bbp_add_error( 'bbp_notification_permission', __( '<strong>ERROR</strong>: You do not have permission to mark notifications for that user.', 'bbpress' ) );
    169169    }
    170170
  • trunk/src/includes/forums/functions.php

    r6135 r6141  
    143143    // User cannot create forums
    144144    if ( !current_user_can( 'publish_forums' ) ) {
    145         bbp_add_error( 'bbp_forum_permissions', __( '<strong>ERROR</strong>: You do not have permission to create new forums.', 'bbpress' ) );
     145        bbp_add_error( 'bbp_forum_permission', __( '<strong>ERROR</strong>: You do not have permission to create new forums.', 'bbpress' ) );
    146146        return;
    147147    }
     
    423423    // User cannot edit this forum
    424424    } elseif ( !current_user_can( 'edit_forum', $forum_id ) ) {
    425         bbp_add_error( 'bbp_edit_forum_permissions', __( '<strong>ERROR</strong>: You do not have permission to edit that forum.', 'bbpress' ) );
     425        bbp_add_error( 'bbp_edit_forum_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that forum.', 'bbpress' ) );
    426426        return;
    427427    }
  • trunk/src/includes/replies/functions.php

    r6140 r6141  
    180180        // User cannot create replies
    181181        if ( !current_user_can( 'publish_replies' ) ) {
    182             bbp_add_error( 'bbp_reply_permissions', __( '<strong>ERROR</strong>: You do not have permission to reply.', 'bbpress' ) );
     182            bbp_add_error( 'bbp_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to reply.', 'bbpress' ) );
    183183        }
    184184
     
    573573            // User cannot edit this reply
    574574            if ( !current_user_can( 'edit_reply', $reply_id ) ) {
    575                 bbp_add_error( 'bbp_edit_reply_permissions', __( '<strong>ERROR</strong>: You do not have permission to edit that reply.', 'bbpress' ) );
     575                bbp_add_error( 'bbp_edit_reply_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that reply.', 'bbpress' ) );
    576576                return;
    577577            }
     
    13311331
    13321332    if ( empty( $_POST['bbp_reply_id'] ) ) {
    1333         bbp_add_error( 'bbp_move_reply_reply_id', __( '<strong>ERROR</strong>: Reply ID to move not found!', 'bbpress' ) );
     1333        bbp_add_error( 'bbp_move_reply_reply_id', __( '<strong>ERROR</strong>: A reply ID is required', 'bbpress' ) );
    13341334    } else {
    13351335        $move_reply_id = (int) $_POST['bbp_reply_id'];
     
    13611361    // Use cannot edit topic
    13621362    if ( !current_user_can( 'edit_topic', $source_topic->ID ) ) {
    1363         bbp_add_error( 'bbp_move_reply_source_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the source topic.', 'bbpress' ) );
     1363        bbp_add_error( 'bbp_move_reply_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
    13641364    }
    13651365
     
    13841384                // Get destination topic id
    13851385                if ( empty( $_POST['bbp_destination_topic'] ) ) {
    1386                     bbp_add_error( 'bbp_move_reply_destination_id', __( '<strong>ERROR</strong>: Destination topic ID not found!', 'bbpress' ) );
     1386                    bbp_add_error( 'bbp_move_reply_destination_id', __( '<strong>ERROR</strong>: A topic ID is required.', 'bbpress' ) );
    13871387                } else {
    13881388                    $destination_topic_id = (int) $_POST['bbp_destination_topic'];
     
    13941394                // No destination topic
    13951395                if ( empty( $destination_topic ) ) {
    1396                     bbp_add_error( 'bbp_move_reply_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to move to was not found!', 'bbpress' ) );
     1396                    bbp_add_error( 'bbp_move_reply_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to move to was not found.', 'bbpress' ) );
    13971397                }
    13981398
    13991399                // User cannot edit the destination topic
    14001400                if ( !current_user_can( 'edit_topic', $destination_topic->ID ) ) {
    1401                     bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the destination topic!', 'bbpress' ) );
     1401                    bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
    14021402                }
    14031403
     
    14581458                // User cannot publish posts
    14591459                } else {
    1460                     bbp_add_error( 'bbp_move_reply_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to create new topics. The reply could not be converted into a topic.', 'bbpress' ) );
     1460                    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' ) );
    14611461                }
    14621462
     
    16361636    // What is the user doing here?
    16371637    if ( ! current_user_can( 'edit_reply', $reply_id ) || ( 'bbp_toggle_reply_trash' === $action && ! current_user_can( 'delete_reply', $reply_id ) ) ) {
    1638         bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>ERROR:</strong> You do not have the permission to do that.', 'bbpress' ) );
     1638        bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>ERROR:</strong> You do not have permission to do that.', 'bbpress' ) );
    16391639        return;
    16401640    }
     
    17121712            $is_approve         = bbp_is_reply_pending( $r['id'] );
    17131713            $retval['status']   = $is_approve ? bbp_approve_reply( $r['id'] ) : bbp_unapprove_reply( $r['id'] );
    1714             $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' );
     1714            $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' );
    17151715            $retval['view_all'] = ! $is_approve;
    17161716
     
    17231723            $is_spam            = bbp_is_reply_spam( $r['id'] );
    17241724            $retval['status']   = $is_spam ? bbp_unspam_reply( $r['id'] ) : bbp_spam_reply( $r['id'] );
    1725             $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' );
     1725            $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' );
    17261726            $retval['view_all'] = ! $is_spam;
    17271727
     
    17381738                    $retval['view_all'] = true;
    17391739                    $retval['status']   = wp_trash_post( $r['id'] );
    1740                     $retval['message']  = __( '<strong>ERROR</strong>: There was a problem trashing the reply!', 'bbpress' );
     1740                    $retval['message']  = __( '<strong>ERROR</strong>: There was a problem trashing the reply.', 'bbpress' );
    17411741
    17421742                    break;
     
    17461746
    17471747                    $retval['status']  = wp_untrash_post( $r['id'] );
    1748                     $retval['message'] = __( '<strong>ERROR</strong>: There was a problem untrashing the reply!', 'bbpress' );
     1748                    $retval['message'] = __( '<strong>ERROR</strong>: There was a problem untrashing the reply.', 'bbpress' );
    17491749
    17501750                    break;
     
    17541754
    17551755                    $retval['status']  = wp_delete_post( $r['id'] );
    1756                     $retval['message'] = __( '<strong>ERROR</strong>: There was a problem deleting the reply!', 'bbpress' );
     1756                    $retval['message'] = __( '<strong>ERROR</strong>: There was a problem deleting the reply.', 'bbpress' );
    17571757
    17581758                    break;
  • trunk/src/includes/topics/functions.php

    r6140 r6141  
    163163        // User cannot create topics
    164164        if ( ! current_user_can( 'publish_topics' ) ) {
    165             bbp_add_error( 'bbp_topic_permissions', __( '<strong>ERROR</strong>: You do not have permission to create new topics.', 'bbpress' ) );
     165            bbp_add_error( 'bbp_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to create new topics.', 'bbpress' ) );
    166166            return;
    167167        }
     
    505505            // User cannot edit this topic
    506506            if ( ! current_user_can( 'edit_topic', $topic_id ) ) {
    507                 bbp_add_error( 'bbp_edit_topic_permissions', __( '<strong>ERROR</strong>: You do not have permission to edit that topic.', 'bbpress' ) );
     507                bbp_add_error( 'bbp_edit_topic_permission', __( '<strong>ERROR</strong>: You do not have permission to edit that topic.', 'bbpress' ) );
    508508            }
    509509
     
    12331233    // Cannot edit source topic
    12341234    if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) {
    1235         bbp_add_error( 'bbp_merge_topic_source_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the source topic.', 'bbpress' ) );
     1235        bbp_add_error( 'bbp_merge_topic_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
    12361236        return;
    12371237    }
     
    12531253    // Cannot edit destination topic
    12541254    if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) {
    1255         bbp_add_error( 'bbp_merge_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the destination topic.', 'bbpress' ) );
     1255        bbp_add_error( 'bbp_merge_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
    12561256    }
    12571257
     
    15121512
    15131513    if ( empty( $_POST['bbp_reply_id'] ) ) {
    1514         bbp_add_error( 'bbp_split_topic_reply_id', __( '<strong>ERROR</strong>: Reply ID to split the topic from not found!', 'bbpress' ) );
     1514        bbp_add_error( 'bbp_split_topic_reply_id', __( '<strong>ERROR</strong>: A reply ID is required.', 'bbpress' ) );
    15151515    } else {
    15161516        $from_reply_id = (int) $_POST['bbp_reply_id'];
     
    15421542    // Use cannot edit topic
    15431543    if ( ! current_user_can( 'edit_topic', $source_topic->ID ) ) {
    1544         bbp_add_error( 'bbp_split_topic_source_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the source topic.', 'bbpress' ) );
     1544        bbp_add_error( 'bbp_split_topic_source_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the source topic.', 'bbpress' ) );
    15451545    }
    15461546
     
    15651565                // Get destination topic id
    15661566                if ( empty( $_POST['bbp_destination_topic'] ) ) {
    1567                     bbp_add_error( 'bbp_split_topic_destination_id', __( '<strong>ERROR</strong>: Destination topic ID not found!', 'bbpress' ) );
     1567                    bbp_add_error( 'bbp_split_topic_destination_id', __( '<strong>ERROR</strong>: A topic ID is required.', 'bbpress' ) );
    15681568                } else {
    15691569                    $destination_topic_id = (int) $_POST['bbp_destination_topic'];
     
    15751575                // No destination topic
    15761576                if ( empty( $destination_topic ) ) {
    1577                     bbp_add_error( 'bbp_split_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to split to was not found!', 'bbpress' ) );
     1577                    bbp_add_error( 'bbp_split_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to split to was not found.', 'bbpress' ) );
    15781578                }
    15791579
    15801580                // User cannot edit the destination topic
    15811581                if ( ! current_user_can( 'edit_topic', $destination_topic->ID ) ) {
    1582                     bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to edit the destination topic!', 'bbpress' ) );
     1582                    bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the destination topic.', 'bbpress' ) );
    15831583                }
    15841584
     
    16231623                // User cannot publish posts
    16241624                } else {
    1625                     bbp_add_error( 'bbp_split_topic_destination_permission', __( '<strong>ERROR</strong>: You do not have the permissions to create new topics. The reply could not be converted into a topic.', 'bbpress' ) );
     1625                    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' ) );
    16261626                }
    16271627
     
    18981898            // Can user edit topic tags?
    18991899            if ( ! current_user_can( 'edit_topic_tags' ) ) {
    1900                 bbp_add_error( 'bbp_manage_topic_tag_update_permissions', __( '<strong>ERROR</strong>: You do not have the permissions to edit the topic tags.', 'bbpress' ) );
     1900                bbp_add_error( 'bbp_manage_topic_tag_update_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) );
    19011901                return;
    19021902            }
     
    19381938            // Can user edit topic tags?
    19391939            if ( ! current_user_can( 'edit_topic_tags' ) ) {
    1940                 bbp_add_error( 'bbp_manage_topic_tag_merge_permissions', __( '<strong>ERROR</strong>: You do not have the permissions to edit the topic tags.', 'bbpress' ) );
     1940                bbp_add_error( 'bbp_manage_topic_tag_merge_permission', __( '<strong>ERROR</strong>: You do not have permission to edit the topic tags.', 'bbpress' ) );
    19411941                return;
    19421942            }
     
    19961996            // Can user delete topic tags?
    19971997            if ( ! current_user_can( 'delete_topic_tags' ) ) {
    1998                 bbp_add_error( 'bbp_manage_topic_tag_delete_permissions', __( '<strong>ERROR</strong>: You do not have the permissions to delete the topic tags.', 'bbpress' ) );
     1998                bbp_add_error( 'bbp_manage_topic_tag_delete_permission', __( '<strong>ERROR</strong>: You do not have permission to delete the topic tags.', 'bbpress' ) );
    19991999                return;
    20002000            }
     
    21682168    // What is the user doing here?
    21692169    if ( ! current_user_can( 'edit_topic', $topic->ID ) || ( 'bbp_toggle_topic_trash' === $action && ! current_user_can( 'delete_topic', $topic->ID ) ) ) {
    2170         bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>ERROR:</strong> You do not have the permission to do that.', 'bbpress' ) );
     2170        bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>ERROR:</strong> You do not have permission to do that.', 'bbpress' ) );
    21712171        return;
    21722172    }
  • trunk/src/includes/users/functions.php

    r6114 r6141  
    496496    // Check for empty topic
    497497    if ( empty( $topic_id ) ) {
    498         bbp_add_error( 'bbp_favorite_topic_id', __( '<strong>ERROR</strong>: No topic was found! Which topic are you marking/unmarking as favorite?', 'bbpress' ) );
     498        bbp_add_error( 'bbp_favorite_topic_id', __( '<strong>ERROR</strong>: No topic was found. Which topic are you marking/unmarking as favorite?', 'bbpress' ) );
    499499
    500500    // Check nonce
     
    504504    // Check current user's ability to edit the user
    505505    } elseif ( ! current_user_can( 'edit_user', $user_id ) ) {
    506         bbp_add_error( 'bbp_favorite_permissions', __( '<strong>ERROR</strong>: You don\'t have the permission to edit favorites of that user!', 'bbpress' ) );
     506        bbp_add_error( 'bbp_favorite_permission', __( '<strong>ERROR</strong>: You do not have permission to edit favorites for that user!.', 'bbpress' ) );
    507507    }
    508508
     
    546546    // Fail! Handle errors
    547547    } elseif ( true === $is_favorite && 'bbp_favorite_remove' === $action ) {
    548         bbp_add_error( 'bbp_favorite_remove', __( '<strong>ERROR</strong>: There was a problem removing that topic from favorites!', 'bbpress' ) );
     548        bbp_add_error( 'bbp_favorite_remove', __( '<strong>ERROR</strong>: There was a problem removing that topic from favorites.', 'bbpress' ) );
    549549    } elseif ( false === $is_favorite && 'bbp_favorite_add' === $action ) {
    550         bbp_add_error( 'bbp_favorite_add',    __( '<strong>ERROR</strong>: There was a problem favoriting that topic!', 'bbpress' ) );
     550        bbp_add_error( 'bbp_favorite_add',    __( '<strong>ERROR</strong>: There was a problem favoriting that topic.', 'bbpress' ) );
    551551    }
    552552}
     
    11531153    // Check for empty forum
    11541154    if ( empty( $forum_id ) ) {
    1155         bbp_add_error( 'bbp_subscription_forum_id', __( '<strong>ERROR</strong>: No forum was found! Which forum are you subscribing/unsubscribing to?', 'bbpress' ) );
     1155        bbp_add_error( 'bbp_subscription_forum_id', __( '<strong>ERROR</strong>: No forum was found. Which forum are you subscribing/unsubscribing to?', 'bbpress' ) );
    11561156
    11571157    // Check nonce
     
    11611161    // Check current user's ability to edit the user
    11621162    } elseif ( ! current_user_can( 'edit_user', $user_id ) ) {
    1163         bbp_add_error( 'bbp_subscription_permissions', __( '<strong>ERROR</strong>: You don\'t have the permission to edit favorites of that user!', 'bbpress' ) );
     1163        bbp_add_error( 'bbp_subscription_permission', __( '<strong>ERROR</strong>: You do not have permission to edit favorites of that user.', 'bbpress' ) );
    11641164    }
    11651165
     
    12031203    // Fail! Handle errors
    12041204    } elseif ( true === $is_subscription && 'bbp_unsubscribe' === $action ) {
    1205         bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that forum!', 'bbpress' ) );
     1205        bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that forum.', 'bbpress' ) );
    12061206    } elseif ( false === $is_subscription && 'bbp_subscribe' === $action ) {
    1207         bbp_add_error( 'bbp_subscribe',    __( '<strong>ERROR</strong>: There was a problem subscribing to that forum!', 'bbpress' ) );
     1207        bbp_add_error( 'bbp_subscribe',    __( '<strong>ERROR</strong>: There was a problem subscribing to that forum.', 'bbpress' ) );
    12081208    }
    12091209}
     
    12581258    // Check for empty topic
    12591259    if ( empty( $topic_id ) ) {
    1260         bbp_add_error( 'bbp_subscription_topic_id', __( '<strong>ERROR</strong>: No topic was found! Which topic are you subscribing/unsubscribing to?', 'bbpress' ) );
     1260        bbp_add_error( 'bbp_subscription_topic_id', __( '<strong>ERROR</strong>: No topic was found. Which topic are you subscribing/unsubscribing to?', 'bbpress' ) );
    12611261
    12621262    // Check nonce
     
    12661266    // Check current user's ability to edit the user
    12671267    } elseif ( ! current_user_can( 'edit_user', $user_id ) ) {
    1268         bbp_add_error( 'bbp_subscription_permissions', __( '<strong>ERROR</strong>: You don\'t have the permission to edit favorites of that user!', 'bbpress' ) );
     1268        bbp_add_error( 'bbp_subscription_permission', __( '<strong>ERROR</strong>: You do not have permission to edit favorites of that user.', 'bbpress' ) );
    12691269    }
    12701270
     
    13081308    // Fail! Handle errors
    13091309    } elseif ( true === $is_subscription && 'bbp_unsubscribe' === $action ) {
    1310         bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that topic!', 'bbpress' ) );
     1310        bbp_add_error( 'bbp_unsubscribe', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that topic.', 'bbpress' ) );
    13111311    } elseif ( false === $is_subscription && 'bbp_subscribe' === $action ) {
    1312         bbp_add_error( 'bbp_subscribe',    __( '<strong>ERROR</strong>: There was a problem subscribing to that topic!', 'bbpress' ) );
     1312        bbp_add_error( 'bbp_subscribe',    __( '<strong>ERROR</strong>: There was a problem subscribing to that topic.', 'bbpress' ) );
    13131313    }
    13141314}
  • trunk/src/templates/default/bbpress/feedback-no-forums.php

    r5770 r6141  
    1212<div class="bbp-template-notice">
    1313    <ul>
    14         <li><?php esc_html_e( 'Oh bother! No forums were found here!', 'bbpress' ); ?></li>
     14        <li><?php esc_html_e( 'Oh, bother! No forums were found here.', 'bbpress' ); ?></li>
    1515    </ul>
    1616</div>
  • trunk/src/templates/default/bbpress/feedback-no-replies.php

    r5770 r6141  
    1212<div class="bbp-template-notice">
    1313    <ul>
    14         <li><?php esc_html_e( 'Oh bother! No replies were found here!', 'bbpress' ); ?></li>
     14        <li><?php esc_html_e( 'Oh, bother! No replies were found here.', 'bbpress' ); ?></li>
    1515    </ul>
    1616</div>
  • trunk/src/templates/default/bbpress/feedback-no-search.php

    r5688 r6141  
    1212<div class="bbp-template-notice">
    1313    <ul>
    14         <li><?php esc_html_e( 'Oh bother! No search results were found here!', 'bbpress' ); ?></li>
     14        <li><?php esc_html_e( 'Oh, bother! No search results were found here.', 'bbpress' ); ?></li>
    1515    </ul>
    1616</div>
  • trunk/src/templates/default/bbpress/feedback-no-topics.php

    r5770 r6141  
    1212<div class="bbp-template-notice">
    1313    <ul>
    14         <li><?php esc_html_e( 'Oh bother! No topics were found here!', 'bbpress' ); ?></li>
     14        <li><?php esc_html_e( 'Oh, bother! No topics were found here.', 'bbpress' ); ?></li>
    1515    </ul>
    1616</div>
  • trunk/src/templates/default/bbpress/form-reply-move.php

    r5770 r6141  
    9090        <div id="no-reply-<?php bbp_reply_id(); ?>" class="bbp-no-reply">
    9191            <div class="entry-content"><?php is_user_logged_in()
    92                 ? esc_html_e( 'You do not have the permissions to edit this reply!', 'bbpress' )
    93                 : esc_html_e( 'You cannot edit this reply.',                         'bbpress' );
     92                ? esc_html_e( 'You do not have permission to edit this reply.', 'bbpress' )
     93                : esc_html_e( 'You cannot edit this reply.',                    'bbpress' );
    9494            ?></div>
    9595        </div>
  • trunk/src/templates/default/bbpress/form-topic-merge.php

    r5770 r6141  
    112112        <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
    113113            <div class="entry-content"><?php is_user_logged_in()
    114                 ? esc_html_e( 'You do not have the permissions to edit this topic!', 'bbpress' )
    115                 : esc_html_e( 'You cannot edit this topic.',                         'bbpress' );
     114                ? esc_html_e( 'You do not have permission to edit this topic.', 'bbpress' )
     115                : esc_html_e( 'You cannot edit this topic.',                    'bbpress' );
    116116            ?></div>
    117117        </div>
  • trunk/src/templates/default/bbpress/form-topic-split.php

    r5770 r6141  
    116116        <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
    117117            <div class="entry-content"><?php is_user_logged_in()
    118                 ? esc_html_e( 'You do not have the permissions to edit this topic!', 'bbpress' )
    119                 : esc_html_e( 'You cannot edit this topic.',                         'bbpress' );
     118                ? esc_html_e( 'You do not have permission to edit this topic.', 'bbpress' )
     119                : esc_html_e( 'You cannot edit this topic.',                    'bbpress' );
    120120            ?></div>
    121121        </div>
Note: See TracChangeset for help on using the changeset viewer.