Ticket #5878: try-again.diff
| File try-again.diff, 6.4 KB (added by , 12 years ago) |
|---|
-
src/bp-groups/bp-groups-screens.php
729 729 730 730 // Promote a user. 731 731 if ( !groups_promote_member( $user_id, $bp->groups->current_group->id, $status ) ) 732 bp_core_add_message( __( 'There was an error when promoting that user, please try again ', 'buddypress' ), 'error' );732 bp_core_add_message( __( 'There was an error when promoting that user, please try again.', 'buddypress' ), 'error' ); 733 733 else 734 734 bp_core_add_message( __( 'User promoted successfully', 'buddypress' ) ); 735 735 … … 754 754 755 755 // Demote a user. 756 756 elseif ( !groups_demote_member( $user_id, $bp->groups->current_group->id ) ) 757 bp_core_add_message( __( 'There was an error when demoting that user; please try again ', 'buddypress' ), 'error' );757 bp_core_add_message( __( 'There was an error when demoting that user; please try again.', 'buddypress' ), 'error' ); 758 758 else 759 759 bp_core_add_message( __( 'User demoted successfully', 'buddypress' ) ); 760 760 … … 772 772 773 773 // Ban a user. 774 774 if ( !groups_ban_member( $user_id, $bp->groups->current_group->id ) ) 775 bp_core_add_message( __( 'There was an error when banning that user; please try again ', 'buddypress' ), 'error' );775 bp_core_add_message( __( 'There was an error when banning that user; please try again.', 'buddypress' ), 'error' ); 776 776 else 777 777 bp_core_add_message( __( 'User banned successfully', 'buddypress' ) ); 778 778 … … 790 790 791 791 // Remove a ban for user. 792 792 if ( !groups_unban_member( $user_id, $bp->groups->current_group->id ) ) 793 bp_core_add_message( __( 'There was an error when unbanning that user, please try again ', 'buddypress' ), 'error' );793 bp_core_add_message( __( 'There was an error when unbanning that user, please try again.', 'buddypress' ), 'error' ); 794 794 else 795 795 bp_core_add_message( __( 'User ban removed successfully', 'buddypress' ) ); 796 796 … … 808 808 809 809 // Remove a user. 810 810 if ( !groups_remove_member( $user_id, $bp->groups->current_group->id ) ) 811 bp_core_add_message( __( 'There was an error removing that user from the group; please try again ', 'buddypress' ), 'error' );811 bp_core_add_message( __( 'There was an error removing that user from the group; please try again.', 'buddypress' ), 'error' ); 812 812 else 813 813 bp_core_add_message( __( 'User removed successfully', 'buddypress' ) ); 814 814 … … 933 933 <thead> 934 934 <tr> 935 935 <th class="icon"></th> 936 <th class="title"><?php _ex( 'Groups', 'Group settings on notification settings page', 'buddypress' ) ?></th> 936 <th class="title"><?php _ex( 'Groups', 'Group settings on notification settings page', 'buddypress' ) ?></th> 937 937 <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th> 938 938 <th class="no"><?php _e( 'No', 'buddypress' )?></th> 939 939 </tr> -
src/bp-messages/bp-messages-screens.php
61 61 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 67 67 if ( isset( $_POST['send-notice'] ) ) { … … 69 69 bp_core_add_message( __( 'Notice sent successfully!', 'buddypress' ) ); 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 { 75 75 // Filter recipients into the format we need - array( 'username/userid', 'username/userid' ) … … 88 88 bp_core_add_message( __( 'Message sent successfully!', 'buddypress' ) ); 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 } 94 94 } -
src/bp-xprofile/bp-xprofile-admin.php
186 186 $group->description = !empty( $_POST['group_description'] ) ? wp_filter_kses( $_POST['group_description'] ) : ''; 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 { 192 192 $message = __( 'The group was saved successfully.', 'buddypress' ); … … 218 218 $group = new BP_XProfile_Group( $group_id ); 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 { 224 224 $message = __( 'The group was deleted successfully.', 'buddypress' ); … … 262 262 $field_id = $field->save(); 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 268 268 unset( $_GET['mode'] ); … … 317 317 $field = new BP_XProfile_Field( $field_id ); 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 { 323 323 $message = sprintf( __( 'The %s was deleted successfully!', 'buddypress' ), $field_type );