Changeset 9190
- Timestamp:
- 11/26/2014 02:47:34 PM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 12 edited
-
bp-activity/bp-activity-actions.php (modified) (4 diffs)
-
bp-core/bp-core-avatars.php (modified) (1 diff)
-
bp-forums/deprecated/1.6.php (modified) (1 diff)
-
bp-groups/bp-groups-actions.php (modified) (2 diffs)
-
bp-groups/bp-groups-screens.php (modified) (13 diffs)
-
bp-members/bp-members-admin.php (modified) (5 diffs)
-
bp-messages/bp-messages-actions.php (modified) (1 diff)
-
bp-messages/bp-messages-screens.php (modified) (3 diffs)
-
bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)
-
bp-xprofile/bp-xprofile-actions.php (modified) (1 diff)
-
bp-xprofile/bp-xprofile-admin.php (modified) (4 diffs)
-
bp-xprofile/bp-xprofile-screens.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-actions.php
r9079 r9190 363 363 bp_core_add_message( __( 'Update Posted!', 'buddypress' ) ); 364 364 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' ); 366 366 367 367 // Redirect … … 428 428 bp_core_add_message( __( 'Reply Posted!', 'buddypress' ) ); 429 429 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' ); 431 431 432 432 bp_core_redirect( wp_get_referer() . '#ac-form-' . $activity_id ); … … 462 462 bp_core_add_message( __( 'Activity marked as favorite.', 'buddypress' ) ); 463 463 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' ); 465 465 466 466 bp_core_redirect( wp_get_referer() . '#activity-' . bp_action_variable( 0 ) ); … … 496 496 bp_core_add_message( __( 'Activity removed as favorite.', 'buddypress' ) ); 497 497 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' ); 499 499 500 500 bp_core_redirect( wp_get_referer() . '#activity-' . bp_action_variable( 0 ) ); -
trunk/src/bp-core/bp-core-avatars.php
r9158 r9190 577 577 578 578 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' ); 580 580 return false; 581 581 } -
trunk/src/bp-forums/deprecated/1.6.php
r7965 r9190 141 141 if ( isset( $_REQUEST['doinstall'] ) && ( 1 == (int) $_REQUEST['doinstall'] ) ) { 142 142 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' ); 144 144 } else { 145 145 ?> -
trunk/src/bp-groups/bp-groups-actions.php
r9026 r9190 164 164 165 165 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' ); 167 167 bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_get_groups_current_create_step() . '/' ); 168 168 } … … 188 188 189 189 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' ); 191 191 bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_get_groups_current_create_step() . '/' ); 192 192 } -
trunk/src/bp-groups/bp-groups-screens.php
r9157 r9190 525 525 bp_core_add_message( __( 'Group invite accepted', 'buddypress' ) ); 526 526 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' ); 528 528 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) ); 529 529 } … … 537 537 538 538 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' ); 540 540 } else { 541 541 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' ) ); … … 597 597 598 598 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' ); 600 600 } else { 601 601 bp_core_add_message( __( 'Group details were successfully updated.', 'buddypress' ) ); … … 644 644 645 645 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' ); 647 647 } else { 648 648 bp_core_add_message( __( 'Group settings were successfully updated.', 'buddypress' ) ); … … 683 683 bp_core_add_message( __( 'The group profile photo was deleted successfully!', 'buddypress' ) ); 684 684 } 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' ); 686 686 } 687 687 } … … 762 762 // Promote a user. 763 763 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' ); 765 765 else 766 766 bp_core_add_message( __( 'User promoted successfully', 'buddypress' ) ); … … 787 787 // Demote a user. 788 788 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' ); 790 790 else 791 791 bp_core_add_message( __( 'User demoted successfully', 'buddypress' ) ); … … 805 805 // Ban a user. 806 806 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' ); 808 808 else 809 809 bp_core_add_message( __( 'User banned successfully', 'buddypress' ) ); … … 823 823 // Remove a ban for user. 824 824 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' ); 826 826 else 827 827 bp_core_add_message( __( 'User ban removed successfully', 'buddypress' ) ); … … 841 841 // Remove a user. 842 842 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' ); 844 844 else 845 845 bp_core_add_message( __( 'User removed successfully', 'buddypress' ) ); … … 883 883 // Accept the membership request 884 884 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' ); 886 886 else 887 887 bp_core_add_message( __( 'Group membership request accepted', 'buddypress' ) ); … … 894 894 // Reject the membership request 895 895 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' ); 897 897 else 898 898 bp_core_add_message( __( 'Group membership request rejected', 'buddypress' ) ); … … 931 931 // Group admin has deleted the group, now do it. 932 932 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' ); 934 934 } else { 935 935 bp_core_add_message( __( 'The group was deleted successfully', 'buddypress' ) ); -
trunk/src/bp-members/bp-members-admin.php
r9115 r9190 309 309 $notice = array( 310 310 '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' ) 312 312 ); 313 313 break; … … 339 339 $notice = array( 340 340 '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' ) 342 342 ); 343 343 break; … … 1523 1523 $notice = array( 1524 1524 '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' ), 1526 1526 ); 1527 1527 break; … … 1530 1530 $notice = array( 1531 1531 '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' ), 1533 1533 ); 1534 1534 break; … … 1537 1537 $notice = array( 1538 1538 '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' ), 1540 1540 ); 1541 1541 break; -
trunk/src/bp-messages/bp-messages-actions.php
r9161 r9190 48 48 bp_core_add_message( __( 'Your reply was sent successfully', 'buddypress' ) ); 49 49 } 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' ); 51 51 } 52 52 -
trunk/src/bp-messages/bp-messages-screens.php
r8696 r9190 62 62 // Check we have what we need 63 63 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' ); 65 65 } else { 66 66 // If this is a notice, send it … … 70 70 bp_core_redirect( bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox/' ); 71 71 } 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' ); 73 73 } 74 74 } else { … … 89 89 bp_core_redirect( bp_loggedin_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id . '/' ); 90 90 } 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' ); 92 92 } 93 93 } -
trunk/src/bp-templates/bp-legacy/buddypress-functions.php
r9187 r9190 724 724 725 725 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>' ); 727 727 728 728 $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 39 39 bp_core_add_message( __( 'Your profile photo was deleted successfully!', 'buddypress' ) ); 40 40 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' ); 42 42 43 43 bp_core_redirect( wp_get_referer() ); -
trunk/src/bp-xprofile/bp-xprofile-admin.php
r8823 r9190 187 187 188 188 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' ); 190 190 $type = 'error'; 191 191 } else { … … 219 219 220 220 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' ); 222 222 $type = 'error'; 223 223 } else { … … 263 263 264 264 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' ); 266 266 $type = 'error'; 267 267 … … 318 318 319 319 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 ); 321 321 $type = 'error'; 322 322 } else { -
trunk/src/bp-xprofile/bp-xprofile-screens.php
r8678 r9190 140 140 // Set the feedback messages 141 141 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' ); 143 143 } else { 144 144 bp_core_add_message( __( 'Changes saved.', 'buddypress' ) );
Note: See TracChangeset
for help on using the changeset viewer.