Skip to:
Content

BuddyPress.org

Changeset 9190


Ignore:
Timestamp:
11/26/2014 02:47:34 PM (7 years ago)
Author:
boonebgorges
Message:

Remove some run-on sentences, also some comma splices, they were kind of annoying, they made BuddyPress more annoying to use, this is much better, thanks for using BuddyPress.

Props tharsheblows.
Fixes #5878.

Location:
trunk/src
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-activity/bp-activity-actions.php

    r9079 r9190  
    363363        bp_core_add_message( __( 'Update Posted!', 'buddypress' ) );
    364364    else
    365         bp_core_add_message( __( 'There was an error when posting your update, please try again.', 'buddypress' ), 'error' );
     365        bp_core_add_message( __( 'There was an error when posting your update. Please try again.', 'buddypress' ), 'error' );
    366366
    367367    // Redirect
     
    428428        bp_core_add_message( __( 'Reply Posted!', 'buddypress' ) );
    429429    else
    430         bp_core_add_message( __( 'There was an error posting that reply, please try again.', 'buddypress' ), 'error' );
     430        bp_core_add_message( __( 'There was an error posting that reply. Please try again.', 'buddypress' ), 'error' );
    431431
    432432    bp_core_redirect( wp_get_referer() . '#ac-form-' . $activity_id );
     
    462462        bp_core_add_message( __( 'Activity marked as favorite.', 'buddypress' ) );
    463463    else
    464         bp_core_add_message( __( 'There was an error marking that activity as a favorite, please try again.', 'buddypress' ), 'error' );
     464        bp_core_add_message( __( 'There was an error marking that activity as a favorite. Please try again.', 'buddypress' ), 'error' );
    465465
    466466    bp_core_redirect( wp_get_referer() . '#activity-' . bp_action_variable( 0 ) );
     
    496496        bp_core_add_message( __( 'Activity removed as favorite.', 'buddypress' ) );
    497497    else
    498         bp_core_add_message( __( 'There was an error removing that activity as a favorite, please try again.', 'buddypress' ), 'error' );
     498        bp_core_add_message( __( 'There was an error removing that activity as a favorite. Please try again.', 'buddypress' ), 'error' );
    499499
    500500    bp_core_redirect( wp_get_referer() . '#activity-' . bp_action_variable( 0 ) );
  • trunk/src/bp-core/bp-core-avatars.php

    r9158 r9190  
    577577
    578578    if ( ! bp_core_check_avatar_upload( $file ) ) {
    579         bp_core_add_message( sprintf( __( 'Your upload failed, please try again. Error was: %s', 'buddypress' ), $uploadErrors[$file['file']['error']] ), 'error' );
     579        bp_core_add_message( sprintf( __( 'Your upload failed. Please try again. Error was: %s', 'buddypress' ), $uploadErrors[$file['file']['error']] ), 'error' );
    580580        return false;
    581581    }
  • trunk/src/bp-forums/deprecated/1.6.php

    r7965 r9190  
    141141            if ( isset( $_REQUEST['doinstall'] ) && ( 1 == (int) $_REQUEST['doinstall'] ) ) {
    142142                if ( !bp_forums_configure_existing_install() ) {
    143                     _e( 'The bb-config.php file was not found at that location, please try again.', 'buddypress' );
     143                    _e( 'The bb-config.php file was not found at that location. Please try again.', 'buddypress' );
    144144                } else {
    145145                    ?>
  • trunk/src/bp-groups/bp-groups-actions.php

    r9026 r9190  
    164164
    165165            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
    166                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
     166                bp_core_add_message( __( 'There was an error saving group details. Please try again.', 'buddypress' ), 'error' );
    167167                bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_get_groups_current_create_step() . '/' );
    168168            }
     
    188188
    189189            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_forum' => $group_enable_forum ) ) ) {
    190                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
     190                bp_core_add_message( __( 'There was an error saving group details. Please try again.', 'buddypress' ), 'error' );
    191191                bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_get_groups_current_create_step() . '/' );
    192192            }
  • trunk/src/bp-groups/bp-groups-screens.php

    r9157 r9190  
    525525            bp_core_add_message( __( 'Group invite accepted', 'buddypress' ) );
    526526        else
    527             bp_core_add_message( __( 'There was an error accepting the group invitation; please try again.', 'buddypress' ), 'error' );
     527            bp_core_add_message( __( 'There was an error accepting the group invitation. Please try again.', 'buddypress' ), 'error' );
    528528        bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
    529529    }
     
    537537
    538538        if ( !groups_send_membership_request( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
    539             bp_core_add_message( __( 'There was an error sending your group membership request; please try again.', 'buddypress' ), 'error' );
     539            bp_core_add_message( __( 'There was an error sending your group membership request. Please try again.', 'buddypress' ), 'error' );
    540540        } else {
    541541            bp_core_add_message( __( 'Your membership request was sent to the group administrator successfully. You will be notified when the group administrator responds to your request.', 'buddypress' ) );
     
    597597
    598598            if ( !groups_edit_base_group_details( $_POST['group-id'], $_POST['group-name'], $_POST['group-desc'], $group_notify_members ) ) {
    599                 bp_core_add_message( __( 'There was an error updating group details; please try again.', 'buddypress' ), 'error' );
     599                bp_core_add_message( __( 'There was an error updating group details. Please try again.', 'buddypress' ), 'error' );
    600600            } else {
    601601                bp_core_add_message( __( 'Group details were successfully updated.', 'buddypress' ) );
     
    644644
    645645        if ( !groups_edit_group_settings( $_POST['group-id'], $enable_forum, $status, $invite_status ) ) {
    646             bp_core_add_message( __( 'There was an error updating group settings; please try again.', 'buddypress' ), 'error' );
     646            bp_core_add_message( __( 'There was an error updating group settings. Please try again.', 'buddypress' ), 'error' );
    647647        } else {
    648648            bp_core_add_message( __( 'Group settings were successfully updated.', 'buddypress' ) );
     
    683683            bp_core_add_message( __( 'The group profile photo was deleted successfully!', 'buddypress' ) );
    684684        } else {
    685             bp_core_add_message( __( 'There was a problem deleting the group profile photo; please try again.', 'buddypress' ), 'error' );
     685            bp_core_add_message( __( 'There was a problem deleting the group profile photo. Please try again.', 'buddypress' ), 'error' );
    686686        }
    687687    }
     
    762762            // Promote a user.
    763763            if ( !groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) )
    764                 bp_core_add_message( __( 'There was an error when promoting that user, please try again', 'buddypress' ), 'error' );
     764                bp_core_add_message( __( 'There was an error when promoting that user. Please try again.', 'buddypress' ), 'error' );
    765765            else
    766766                bp_core_add_message( __( 'User promoted successfully', 'buddypress' ) );
     
    787787            // Demote a user.
    788788            elseif ( !groups_demote_member( $user_id, $bp->groups->current_group->id ) )
    789                 bp_core_add_message( __( 'There was an error when demoting that user; please try again', 'buddypress' ), 'error' );
     789                bp_core_add_message( __( 'There was an error when demoting that user. Please try again.', 'buddypress' ), 'error' );
    790790            else
    791791                bp_core_add_message( __( 'User demoted successfully', 'buddypress' ) );
     
    805805            // Ban a user.
    806806            if ( !groups_ban_member( $user_id, $bp->groups->current_group->id ) )
    807                 bp_core_add_message( __( 'There was an error when banning that user; please try again', 'buddypress' ), 'error' );
     807                bp_core_add_message( __( 'There was an error when banning that user. Please try again.', 'buddypress' ), 'error' );
    808808            else
    809809                bp_core_add_message( __( 'User banned successfully', 'buddypress' ) );
     
    823823            // Remove a ban for user.
    824824            if ( !groups_unban_member( $user_id, $bp->groups->current_group->id ) )
    825                 bp_core_add_message( __( 'There was an error when unbanning that user, please try again', 'buddypress' ), 'error' );
     825                bp_core_add_message( __( 'There was an error when unbanning that user. Please try again.', 'buddypress' ), 'error' );
    826826            else
    827827                bp_core_add_message( __( 'User ban removed successfully', 'buddypress' ) );
     
    841841            // Remove a user.
    842842            if ( !groups_remove_member( $user_id, $bp->groups->current_group->id ) )
    843                 bp_core_add_message( __( 'There was an error removing that user from the group; please try again', 'buddypress' ), 'error' );
     843                bp_core_add_message( __( 'There was an error removing that user from the group. Please try again.', 'buddypress' ), 'error' );
    844844            else
    845845                bp_core_add_message( __( 'User removed successfully', 'buddypress' ) );
     
    883883            // Accept the membership request
    884884            if ( !groups_accept_membership_request( $membership_id ) )
    885                 bp_core_add_message( __( 'There was an error accepting the membership request; please try again.', 'buddypress' ), 'error' );
     885                bp_core_add_message( __( 'There was an error accepting the membership request. Please try again.', 'buddypress' ), 'error' );
    886886            else
    887887                bp_core_add_message( __( 'Group membership request accepted', 'buddypress' ) );
     
    894894            // Reject the membership request
    895895            if ( !groups_reject_membership_request( $membership_id ) )
    896                 bp_core_add_message( __( 'There was an error rejecting the membership request; please try again.', 'buddypress' ), 'error' );
     896                bp_core_add_message( __( 'There was an error rejecting the membership request. Please try again.', 'buddypress' ), 'error' );
    897897            else
    898898                bp_core_add_message( __( 'Group membership request rejected', 'buddypress' ) );
     
    931931        // Group admin has deleted the group, now do it.
    932932        if ( !groups_delete_group( $bp->groups->current_group->id ) ) {
    933             bp_core_add_message( __( 'There was an error deleting the group; please try again.', 'buddypress' ), 'error' );
     933            bp_core_add_message( __( 'There was an error deleting the group. Please try again.', 'buddypress' ), 'error' );
    934934        } else {
    935935            bp_core_add_message( __( 'The group was deleted successfully', 'buddypress' ) );
  • trunk/src/bp-members/bp-members-admin.php

    r9115 r9190  
    309309                $notice = array(
    310310                    'class'   => 'error',
    311                     'message' => __( 'There was a problem deleting that avatar, please try again.', 'buddypress' )
     311                    'message' => __( 'There was a problem deleting that avatar. Please try again.', 'buddypress' )
    312312                );
    313313                break;
     
    339339                $notice = array(
    340340                    'class'   => 'error',
    341                     'message' => __( 'There was a problem updating some of your profile information, please try again.', 'buddypress' )
     341                    'message' => __( 'There was a problem updating some of your profile information. Please try again.', 'buddypress' )
    342342                );
    343343                break;
     
    15231523                    $notice = array(
    15241524                        'class'   => 'error',
    1525                         'message' => esc_html__( 'There was a problem sending the activation emails, please try again.', 'buddypress' ),
     1525                        'message' => esc_html__( 'There was a problem sending the activation emails. Please try again.', 'buddypress' ),
    15261526                    );
    15271527                    break;
     
    15301530                    $notice = array(
    15311531                        'class'   => 'error',
    1532                         'message' => esc_html__( 'There was a problem activating accounts, please try again.', 'buddypress' ),
     1532                        'message' => esc_html__( 'There was a problem activating accounts. Please try again.', 'buddypress' ),
    15331533                    );
    15341534                    break;
     
    15371537                    $notice = array(
    15381538                        'class'   => 'error',
    1539                         'message' => esc_html__( 'There was a problem deleting sign-ups, please try again.', 'buddypress' ),
     1539                        'message' => esc_html__( 'There was a problem deleting sign-ups. Please try again.', 'buddypress' ),
    15401540                    );
    15411541                    break;
  • trunk/src/bp-messages/bp-messages-actions.php

    r9161 r9190  
    4848            bp_core_add_message( __( 'Your reply was sent successfully', 'buddypress' ) );
    4949        } else {
    50             bp_core_add_message( __( 'There was a problem sending your reply, please try again', 'buddypress' ), 'error' );
     50            bp_core_add_message( __( 'There was a problem sending your reply. Please try again.', 'buddypress' ), 'error' );
    5151        }
    5252
  • trunk/src/bp-messages/bp-messages-screens.php

    r8696 r9190  
    6262        // Check we have what we need
    6363        if ( empty( $_POST['subject'] ) || empty( $_POST['content'] ) ) {
    64             bp_core_add_message( __( 'There was an error sending that message, please try again', 'buddypress' ), 'error' );
     64            bp_core_add_message( __( 'There was an error sending that message. Please try again.', 'buddypress' ), 'error' );
    6565        } else {
    6666            // If this is a notice, send it
     
    7070                    bp_core_redirect( bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox/' );
    7171                } else {
    72                     bp_core_add_message( __( 'There was an error sending that notice, please try again', 'buddypress' ), 'error' );
     72                    bp_core_add_message( __( 'There was an error sending that notice. Please try again.', 'buddypress' ), 'error' );
    7373                }
    7474            } else {
     
    8989                    bp_core_redirect( bp_loggedin_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id . '/' );
    9090                } else {
    91                     bp_core_add_message( __( 'There was an error sending that message, please try again', 'buddypress' ), 'error' );
     91                    bp_core_add_message( __( 'There was an error sending that message. Please try again.', 'buddypress' ), 'error' );
    9292                }
    9393            }
  • trunk/src/bp-templates/bp-legacy/buddypress-functions.php

    r9187 r9190  
    724724
    725725    if ( empty( $activity_id ) )
    726         exit( '-1<div id="message" class="error bp-ajax-message"><p>' . __( 'There was a problem posting your update; please try again.', 'buddypress' ) . '</p></div>' );
     726        exit( '-1<div id="message" class="error bp-ajax-message"><p>' . __( 'There was a problem posting your update. Please try again.', 'buddypress' ) . '</p></div>' );
    727727
    728728    $last_recorded = ! empty( $_POST['since'] ) ? date( 'Y-m-d H:i:s', intval( $_POST['since'] ) ) : 0;
  • trunk/src/bp-xprofile/bp-xprofile-actions.php

    r8819 r9190  
    3939        bp_core_add_message( __( 'Your profile photo was deleted successfully!', 'buddypress' ) );
    4040    else
    41         bp_core_add_message( __( 'There was a problem deleting your profile photo; please try again.', 'buddypress' ), 'error' );
     41        bp_core_add_message( __( 'There was a problem deleting your profile photo. Please try again.', 'buddypress' ), 'error' );
    4242
    4343    bp_core_redirect( wp_get_referer() );
  • trunk/src/bp-xprofile/bp-xprofile-admin.php

    r8823 r9190  
    187187
    188188            if ( !$group->save() ) {
    189                 $message = __( 'There was an error saving the group. Please try again', 'buddypress' );
     189                $message = __( 'There was an error saving the group. Please try again.', 'buddypress' );
    190190                $type    = 'error';
    191191            } else {
     
    219219
    220220    if ( !$group->delete() ) {
    221         $message = __( 'There was an error deleting the group. Please try again', 'buddypress' );
     221        $message = __( 'There was an error deleting the group. Please try again.', 'buddypress' );
    222222        $type    = 'error';
    223223    } else {
     
    263263
    264264            if ( !$field_id ) {
    265                 $message = __( 'There was an error saving the field. Please try again', 'buddypress' );
     265                $message = __( 'There was an error saving the field. Please try again.', 'buddypress' );
    266266                $type = 'error';
    267267
     
    318318
    319319    if ( !$field->delete( (bool) $delete_data ) ) {
    320         $message = sprintf( __( 'There was an error deleting the %s. Please try again', 'buddypress' ), $field_type );
     320        $message = sprintf( __( 'There was an error deleting the %s. Please try again.', 'buddypress' ), $field_type );
    321321        $type    = 'error';
    322322    } else {
  • trunk/src/bp-xprofile/bp-xprofile-screens.php

    r8678 r9190  
    140140            // Set the feedback messages
    141141            if ( !empty( $errors ) ) {
    142                 bp_core_add_message( __( 'There was a problem updating some of your profile information; please try again.', 'buddypress' ), 'error' );
     142                bp_core_add_message( __( 'There was a problem updating some of your profile information. Please try again.', 'buddypress' ), 'error' );
    143143            } else {
    144144                bp_core_add_message( __( 'Changes saved.', 'buddypress' ) );
Note: See TracChangeset for help on using the changeset viewer.