![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 8662
- Timestamp:
- 07/22/2014 06:13:12 PM (12 years ago)
- Location:
- trunk/src
- Files:
-
- 10 edited
-
bp-activity/bp-activity-actions.php (modified) (2 diffs)
-
bp-activity/bp-activity-loader.php (modified) (1 diff)
-
bp-blogs/bp-blogs-loader.php (modified) (1 diff)
-
bp-blogs/bp-blogs-template.php (modified) (1 diff)
-
bp-groups/bp-groups-functions.php (modified) (1 diff)
-
bp-groups/bp-groups-screens.php (modified) (11 diffs)
-
bp-messages/bp-messages-notifications.php (modified) (1 diff)
-
bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)
-
bp-xprofile/bp-xprofile-actions.php (modified) (1 diff)
-
bp-xprofile/bp-xprofile-screens.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-actions.php
r7517 r8662 438 438 439 439 /* translators: Sitewide activity RSS title - "[Site Name] | Site Wide Activity" */ 440 'title' => sprintf( __( '%s | Site 440 'title' => sprintf( __( '%s | Site-Wide Activity', 'buddypress' ), bp_get_site_name() ), 441 441 442 442 'link' => bp_get_activity_directory_permalink(), … … 541 541 542 542 'link' => trailingslashit( bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() ), 543 'description' => sprintf( __( "Public group activity feed of which %s is a member of.", 'buddypress' ), bp_get_displayed_user_fullname() ),543 'description' => sprintf( __( "Public group activity feed of which %s is a member.", 'buddypress' ), bp_get_displayed_user_fullname() ), 544 544 'activity_args' => array( 545 545 'object' => buddypress()->groups->id, -
trunk/src/bp-activity/bp-activity-loader.php
r8277 r8662 107 107 'root_slug' => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG, 108 108 'has_directory' => true, 109 'directory_title' => _x( 'Site wide Activity', 'component directory title', 'buddypress' ),109 'directory_title' => _x( 'Site-Wide Activity', 'component directory title', 'buddypress' ), 110 110 'notification_callback' => 'bp_activity_format_notifications', 111 111 'search_string' => __( 'Search Activity...', 'buddypress' ), -
trunk/src/bp-blogs/bp-blogs-loader.php
r8591 r8662 25 25 parent::start( 26 26 'blogs', 27 __( 'Site Tracking', 'buddypress' ),27 __( 'Site Directory', 'buddypress' ), 28 28 buddypress()->plugin_dir, 29 29 array( -
trunk/src/bp-blogs/bp-blogs-template.php
r8450 r8662 949 949 950 950 if ( $errors->get_error_code() ) { 951 echo "<p>" . __('There was a problem ,please correct the form below and try again.', 'buddypress') . "</p>";951 echo "<p>" . __('There was a problem; please correct the form below and try again.', 'buddypress') . "</p>"; 952 952 } 953 953 ?> -
trunk/src/bp-groups/bp-groups-functions.php
r8316 r8662 306 306 if ( count( groups_get_group_admins( $group_id ) ) < 2 ) { 307 307 if ( groups_is_user_admin( $user_id, $group_id ) ) { 308 bp_core_add_message( __( 'As the only Admin, you cannot leave the group.', 'buddypress' ), 'error' );308 bp_core_add_message( __( 'As the only admin, you cannot leave the group.', 'buddypress' ), 'error' ); 309 309 return false; 310 310 } -
trunk/src/bp-groups/bp-groups-screens.php
r8164 r8662 506 506 bp_core_add_message( __( 'Group invite accepted', 'buddypress' ) ); 507 507 else 508 bp_core_add_message( __( 'There was an error accepting the group invitation ,please try again.', 'buddypress' ), 'error' );508 bp_core_add_message( __( 'There was an error accepting the group invitation; please try again.', 'buddypress' ), 'error' ); 509 509 bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) ); 510 510 } … … 518 518 519 519 if ( !groups_send_membership_request( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) { 520 bp_core_add_message( __( 'There was an error sending your group membership request ,please try again.', 'buddypress' ), 'error' );520 bp_core_add_message( __( 'There was an error sending your group membership request; please try again.', 'buddypress' ), 'error' ); 521 521 } else { 522 522 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' ) ); … … 569 569 570 570 if ( !groups_edit_base_group_details( $_POST['group-id'], $_POST['group-name'], $_POST['group-desc'], $group_notify_members ) ) { 571 bp_core_add_message( __( 'There was an error updating group details ,please try again.', 'buddypress' ), 'error' );571 bp_core_add_message( __( 'There was an error updating group details; please try again.', 'buddypress' ), 'error' ); 572 572 } else { 573 573 bp_core_add_message( __( 'Group details were successfully updated.', 'buddypress' ) ); … … 613 613 614 614 if ( !groups_edit_group_settings( $_POST['group-id'], $enable_forum, $status, $invite_status ) ) { 615 bp_core_add_message( __( 'There was an error updating group settings ,please try again.', 'buddypress' ), 'error' );615 bp_core_add_message( __( 'There was an error updating group settings; please try again.', 'buddypress' ), 'error' ); 616 616 } else { 617 617 bp_core_add_message( __( 'Group settings were successfully updated.', 'buddypress' ) ); … … 649 649 bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) ); 650 650 } else { 651 bp_core_add_message( __( 'There was a problem deleting that avatar ,please try again.', 'buddypress' ), 'error' );651 bp_core_add_message( __( 'There was a problem deleting that avatar; please try again.', 'buddypress' ), 'error' ); 652 652 } 653 653 } … … 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' ) ); … … 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' ) ); … … 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' ) ); … … 848 848 // Accept the membership request 849 849 if ( !groups_accept_membership_request( $membership_id ) ) 850 bp_core_add_message( __( 'There was an error accepting the membership request ,please try again.', 'buddypress' ), 'error' );850 bp_core_add_message( __( 'There was an error accepting the membership request; please try again.', 'buddypress' ), 'error' ); 851 851 else 852 852 bp_core_add_message( __( 'Group membership request accepted', 'buddypress' ) ); … … 859 859 // Reject the membership request 860 860 if ( !groups_reject_membership_request( $membership_id ) ) 861 bp_core_add_message( __( 'There was an error rejecting the membership request ,please try again.', 'buddypress' ), 'error' );861 bp_core_add_message( __( 'There was an error rejecting the membership request; please try again.', 'buddypress' ), 'error' ); 862 862 else 863 863 bp_core_add_message( __( 'Group membership request rejected', 'buddypress' ) ); … … 893 893 // Group admin has deleted the group, now do it. 894 894 if ( !groups_delete_group( $bp->groups->current_group->id ) ) { 895 bp_core_add_message( __( 'There was an error deleting the group ,please try again.', 'buddypress' ), 'error' );895 bp_core_add_message( __( 'There was an error deleting the group; please try again.', 'buddypress' ), 'error' ); 896 896 } else { 897 897 bp_core_add_message( __( 'The group was deleted successfully', 'buddypress' ) ); -
trunk/src/bp-messages/bp-messages-notifications.php
r8655 r8662 90 90 // Only show the disable notifications line if the settings component is enabled 91 91 if ( bp_is_active( 'settings' ) ) { 92 $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );92 $email_content .= sprintf( __( 'To disable these notifications, please log in and go to: %s', 'buddypress' ), $settings_link ); 93 93 } 94 94 -
trunk/src/bp-templates/bp-legacy/buddypress-functions.php
r8557 r8662 705 705 706 706 if ( empty( $activity_id ) ) 707 exit( '-1<div id="message" class="error"><p>' . __( 'There was a problem posting your update ,please try again.', 'buddypress' ) . '</p></div>' );707 exit( '-1<div id="message" class="error"><p>' . __( 'There was a problem posting your update; please try again.', 'buddypress' ) . '</p></div>' ); 708 708 709 709 $last_recorded = ! empty( $_POST['since'] ) ? date( 'Y-m-d H:i:s', intval( $_POST['since'] ) ) : 0; -
trunk/src/bp-xprofile/bp-xprofile-actions.php
r8258 r8662 39 39 bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) ); 40 40 else 41 bp_core_add_message( __( 'There was a problem deleting that avatar ,please try again.', 'buddypress' ), 'error' );41 bp_core_add_message( __( 'There was a problem deleting that avatar; please try again.', 'buddypress' ), 'error' ); 42 42 43 43 bp_core_redirect( wp_get_referer() ); -
trunk/src/bp-xprofile/bp-xprofile-screens.php
r8631 r8662 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.
