Skip to:
Content

BuddyPress.org

Ticket #5760: usage-changes.patch

File usage-changes.patch, 13.7 KB (added by jreeve, 9 years ago)

  • src/bp-activity/bp-activity-actions.php 

    diff --git a/src/bp-activity/bp-activity-actions.php b/src/bp-activity/bp-activity-actions.php
index f8c5d52..d8e4c23 100644
    a b function bp_activity_action_sitewide_feed() { 
    437437                'id'            => 'sitewide',
    438438
    439439                /* translators: Sitewide activity RSS title - "[Site Name] | Site Wide Activity" */
    440                 'title'         => sprintf( __( '%s | Site Wide Activity', 'buddypress' ), bp_get_site_name() ),
     440                'title'         => sprintf( __( '%s | Site-Wide Activity', 'buddypress' ), bp_get_site_name() ),
    441441
    442442                'link'          => bp_get_activity_directory_permalink(),
    443443                'description'   => __( 'Activity feed for the entire site.', 'buddypress' ),
    … … function bp_activity_action_my_groups_feed() { 
    540540                'title'         => sprintf( __( '%1$s | %2$s | Group Activity', 'buddypress' ), bp_get_site_name(), bp_get_displayed_user_fullname() ),
    541541
    542542                '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() ),
    544544                'activity_args' => array(
    545545                        'object'           => buddypress()->groups->id,
    546546                        'primary_id'       => $group_ids,

  • src/bp-activity/bp-activity-loader.php 

    diff --git a/src/bp-activity/bp-activity-loader.php b/src/bp-activity/bp-activity-loader.php
index 0f68f91..c6fc540 100644
    a b class BP_Activity_Component extends BP_Component { 
    106106                        'slug'                  => BP_ACTIVITY_SLUG,
    107107                        'root_slug'             => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
    108108                        'has_directory'         => true,
    109                         'directory_title'       => _x( 'Sitewide Activity', 'component directory title', 'buddypress' ),
     109                        'directory_title'       => _x( 'Site-Wide Activity', 'component directory title', 'buddypress' ),
    110110                        'notification_callback' => 'bp_activity_format_notifications',
    111111                        'search_string'         => __( 'Search Activity...', 'buddypress' ),
    112112                        'global_tables'         => $global_tables,

  • src/bp-blogs/bp-blogs-loader.php 

    diff --git a/src/bp-blogs/bp-blogs-loader.php b/src/bp-blogs/bp-blogs-loader.php
index c392d32..c68710d 100644
    a b class BP_Blogs_Component extends BP_Component { 
    2222        public function __construct() {
    2323                parent::start(
    2424                        'blogs',
    25                         __( 'Site Tracking', 'buddypress' ),
     25                        __( 'Site Directory', 'buddypress' ),
    2626                        buddypress()->plugin_dir,
    2727                        array(
    2828                                'adminbar_myaccount_order' => 30

  • src/bp-blogs/bp-blogs-template.php 

    diff --git a/src/bp-blogs/bp-blogs-template.php b/src/bp-blogs/bp-blogs-template.php
index e8c2a90..ef8045c 100644
    a b function bp_show_blog_signup_form($blogname = '', $blog_title = '', $errors = '' 
    948948                $errors = $filtered_results['errors'];
    949949
    950950                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>";
    952952                }
    953953                ?>
    954954                <p><?php printf(__("By filling out the form below, you can <strong>add a site to your account</strong>. There is no limit to the number of sites that you can have, so create to your heart's content, but blog responsibly!", 'buddypress'), $current_user->display_name) ?></p>

  • src/bp-groups/bp-groups-functions.php 

    diff --git a/src/bp-groups/bp-groups-functions.php b/src/bp-groups/bp-groups-functions.php
index 971f8b1..92d8c9f 100644
    a b function groups_leave_group( $group_id, $user_id = 0 ) { 
    305305        // Don't let single admins leave the group.
    306306        if ( count( groups_get_group_admins( $group_id ) ) < 2 ) {
    307307                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' );
    309309                        return false;
    310310                }
    311311        }

  • src/bp-groups/bp-groups-screens.php 

    diff --git a/src/bp-groups/bp-groups-screens.php b/src/bp-groups/bp-groups-screens.php
index c2feff5..576a378 100644
    a b function groups_screen_group_request_membership() { 
    505505                if ( groups_accept_invite( bp_loggedin_user_id(), $bp->groups->current_group->id ) )
    506506                        bp_core_add_message( __( 'Group invite accepted', 'buddypress' ) );
    507507                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' );
    509509                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
    510510        }
    511511
    … … function groups_screen_group_request_membership() { 
    517517                        return false;
    518518
    519519                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' );
    521521                } else {
    522522                        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' ) );
    523523                }
    … … function groups_screen_group_admin_edit_details() { 
    568568                        $group_notify_members = isset( $_POST['group-notify-members'] ) ? (int) $_POST['group-notify-members'] : 0;
    569569
    570570                        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' );
    572572                        } else {
    573573                                bp_core_add_message( __( 'Group details were successfully updated.', 'buddypress' ) );
    574574                        }
    … … function groups_screen_group_admin_settings() { 
    612612                        return false;
    613613
    614614                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' );
    616616                } else {
    617617                        bp_core_add_message( __( 'Group settings were successfully updated.', 'buddypress' ) );
    618618                }
    … … function groups_screen_group_admin_avatar() { 
    648648                if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group' ) ) ) {
    649649                        bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
    650650                } 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' );
    652652                }
    653653        }
    654654
    … … function groups_screen_group_admin_manage_members() { 
    754754
    755755                        // Demote a user.
    756756                        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' );
    758758                        else
    759759                                bp_core_add_message( __( 'User demoted successfully', 'buddypress' ) );
    760760
    … … function groups_screen_group_admin_manage_members() { 
    772772
    773773                        // Ban a user.
    774774                        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' );
    776776                        else
    777777                                bp_core_add_message( __( 'User banned successfully', 'buddypress' ) );
    778778
    … … function groups_screen_group_admin_manage_members() { 
    808808
    809809                        // Remove a user.
    810810                        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' );
    812812                        else
    813813                                bp_core_add_message( __( 'User removed successfully', 'buddypress' ) );
    814814
    … … function groups_screen_group_admin_requests() { 
    847847
    848848                        // Accept the membership request
    849849                        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' );
    851851                        else
    852852                                bp_core_add_message( __( 'Group membership request accepted', 'buddypress' ) );
    853853
    … … function groups_screen_group_admin_requests() { 
    858858
    859859                        // Reject the membership request
    860860                        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' );
    862862                        else
    863863                                bp_core_add_message( __( 'Group membership request rejected', 'buddypress' ) );
    864864                }
    … … function groups_screen_group_admin_delete_group() { 
    892892
    893893                // Group admin has deleted the group, now do it.
    894894                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' );
    896896                } else {
    897897                        bp_core_add_message( __( 'The group was deleted successfully', 'buddypress' ) );
    898898

  • src/bp-messages/bp-messages-notifications.php 

    diff --git a/src/bp-messages/bp-messages-notifications.php b/src/bp-messages/bp-messages-notifications.php
index bb0118f..2369724 100644
    a b To view and read your messages please log in and visit: %4$s 
    8989
    9090                        // Only show the disable notifications line if the settings component is enabled
    9191                        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 );
    9393                        }
    9494
    9595                        // Send the message

  • src/bp-templates/bp-legacy/buddypress-functions.php 

    diff --git a/src/bp-templates/bp-legacy/buddypress-functions.php b/src/bp-templates/bp-legacy/buddypress-functions.php
index 784b2dc..49790cf 100644
    a b function bp_legacy_theme_post_update() { 
    704704        }
    705705
    706706        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>' );
    708708
    709709        $last_recorded = ! empty( $_POST['since'] ) ? date( 'Y-m-d H:i:s', intval( $_POST['since'] ) ) : 0;
    710710        if ( $last_recorded ) {

  • src/bp-xprofile/bp-xprofile-actions.php 

    diff --git a/src/bp-xprofile/bp-xprofile-actions.php b/src/bp-xprofile/bp-xprofile-actions.php
index d4fb120..8ecc273 100644
    a b function xprofile_action_delete_avatar() { 
    3838        if ( bp_core_delete_existing_avatar( array( 'item_id' => bp_displayed_user_id() ) ) )
    3939                bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
    4040        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' );
    4242
    4343        bp_core_redirect( wp_get_referer() );
    4444}
    … … function bp_xprofile_action_settings() { 
    105105        // Redirect to the root domain
    106106        bp_core_redirect( bp_displayed_user_domain() . bp_get_settings_slug() . '/profile' );
    107107}
    108 add_action( 'bp_actions', 'bp_xprofile_action_settings' );
    109  No newline at end of file
     108add_action( 'bp_actions', 'bp_xprofile_action_settings' );

  • src/bp-xprofile/bp-xprofile-screens.php 

    diff --git a/src/bp-xprofile/bp-xprofile-screens.php b/src/bp-xprofile/bp-xprofile-screens.php
index 380aac7..f8381e0 100644
    a b function xprofile_screen_edit_profile() { 
    135135
    136136                        // Set the feedback messages
    137137                        if ( !empty( $errors ) ) {
    138                                 bp_core_add_message( __( 'There was a problem updating some of your profile information, please try again.', 'buddypress' ), 'error' );
     138                                bp_core_add_message( __( 'There was a problem updating some of your profile information; please try again.', 'buddypress' ), 'error' );
    139139                        } else {
    140140                                bp_core_add_message( __( 'Changes saved.', 'buddypress' ) );
    141141                        }