Skip to:
Content

BuddyPress.org

Ticket #2703: 2703.diff

File 2703.diff, 13.3 KB (added by sorich87, 14 years ago)

  • bp-friends/bp-friends-notifications.php

     
    2121        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    2222        $subject  = '[' . $sitename . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
    2323
    24         $message = sprintf( __(
    25 '%1$s wants to add you as a friend.
     24        $message = sprintf( __( "%1$s wants to add you as a friend.\n\nTo view all of your pending friendship requests: %2$s\n\nTo view %3$s\'s profile: %4$s\n\n---------------------\n", 'buddypress' ), $initiator_name, $all_requests_link, $initiator_name, $initiator_link );
    2625
    27 To view all of your pending friendship requests: %2$s
    28 
    29 To view %3$s\'s profile: %4$s
    30 
    31 ---------------------
    32 ', 'buddypress' ), $initiator_name, $all_requests_link, $initiator_name, $initiator_link );
    33 
    3426        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    35        
     27
    3628        /* Send the message */
    3729        $to = apply_filters( 'friends_notification_new_request_to', $to );
    3830        $subject = apply_filters( 'friends_notification_new_request_subject', $subject, $initiator_name );
    … …  
    6355        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    6456        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
    6557
    66         $message = sprintf( __(
    67 '%1$s accepted your friend request.
     58        $message = sprintf( __( "%1$s accepted your friend request.\n\nTo view %2$s\'s profile: %3$s\n\n---------------------\n", 'buddypress' ), $friend_name, $friend_name, $friend_link );
    6859
    69 To view %2$s\'s profile: %3$s
    70 
    71 ---------------------
    72 ', 'buddypress' ), $friend_name, $friend_name, $friend_link );
    73 
    7460        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    7561
    7662        /* Send the message */
    … …  
    8369        do_action( 'bp_friends_sent_accepted_email', $initator_id, $subject, $message, $friendship_id, $friend_id );
    8470}
    8571
    86 ?>
    87  No newline at end of file
     72?>

  • bp-activity/bp-activity-notifications.php

     
    3333                        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    3434                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
    3535
    36 $message = sprintf( __(
    37 '%1$s mentioned you in an update:
     36$message = sprintf( __( "%1$s mentioned you in an update:\n\n\"%2$s\"\n\nTo view and respond to the message, log in and visit: %3$s\n\n---------------------\n", 'buddypress' ), $poster_name, $content, $message_link );
    3837
    39 "%2$s"
    40 
    41 To view and respond to the message, log in and visit: %3$s
    42 
    43 ---------------------
    44 ', 'buddypress' ), $poster_name, $content, $message_link );
    45 
    4638                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    4739
    4840                        /* Send the message */
    … …  
    7971                $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    8072                $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
    8173
    82 $message = sprintf( __(
    83 '%1$s replied to one of your updates:
     74$message = sprintf( __( "%1$s replied to one of your updates:\n\n\"%2$s\"\n\nTo view your original update and all comments, log in and visit: %3$s\n\n---------------------\n", 'buddypress' ), $poster_name, $content, $thread_link );
    8475
    85 "%2$s"
    86 
    87 To view your original update and all comments, log in and visit: %3$s
    88 
    89 ---------------------
    90 ', 'buddypress' ), $poster_name, $content, $thread_link );
    91 
    9276                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    9377
    9478                /* Send the message */
    … …  
    124108                $poster_name = stripslashes( $poster_name );
    125109                $content = bp_activity_filter_kses( stripslashes( $content ) );
    126110
    127 $message = sprintf( __(
    128 '%1$s replied to one of your comments:
     111$message = sprintf( __( "%1$s replied to one of your comments:\n\n\"%2$s\"\n\nTo view the original activity, your comment and all replies, log in and visit: %3$s\n\n---------------------\n", 'buddypress' ), $poster_name, $content, $thread_link );
    129112
    130 "%2$s"
    131 
    132 To view the original activity, your comment and all replies, log in and visit: %3$s
    133 
    134 ---------------------
    135 ', 'buddypress' ), $poster_name, $content, $thread_link );
    136 
    137113                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    138114
    139115                /* Send the message */

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

     
    2222                $sitename      = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    2323                $email_subject = '[' . $sitename . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
    2424
    25                 $email_content = sprintf( __(
    26 '%s sent you a new message:
     25                $email_content = sprintf( __( "%1$s sent you a new message:\n\nSubject: %2$s\n\n\"%3$s\"\n\nTo view and read your messages please log in and visit: %4$s\n\n---------------------\n", 'buddypress' ), $sender_name, $subject, $content, $message_link );
    2726
    28 Subject: %s
    29 
    30 "%s"
    31 
    32 To view and read your messages please log in and visit: %s
    33 
    34 ---------------------
    35 ', 'buddypress' ), $sender_name, $subject, $content, $message_link );
    36 
    3727                $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    3828
    3929                /* Send the message */
    … …  
    4737        do_action( 'bp_messages_sent_notification_email', $recipients, $email_subject, $email_content, $args );
    4838}
    4939
    50 ?>
    51  No newline at end of file
     40?>

  • bp-forums/bp-forums-admin.php

     
    7575                        } else {
    7676                        ?>
    7777                                <h3><?php _e( 'New bbPress Installation', 'buddypress' ) ?></h3>
    78                                 <p><?php _e( "You've decided to set up a new installation of bbPress for forum management in BuddyPress. This is very simple and is usually just a one click
    79                                 process. When you're ready, hit the link below.", 'buddypress' ) ?></p>
     78                                <p><?php _e( "You've decided to set up a new installation of bbPress for forum management in BuddyPress. This is very simple and is usually just a one click process. When you're ready, hit the link below.", 'buddypress' ) ?></p>
    8079                                <p><a class="button-primary" href="<?php echo wp_nonce_url( $post_url . '&step=new&doinstall=1', 'bp_forums_new_install_init' ) ?>"><?php _e( 'Complete Installation', 'buddypress' ) ?></a></p>
    8180                        <?php
    8281                        }
    … …  
    257256
    258257        return 1;
    259258}
    260 ?>
    261  No newline at end of file
     259?>

  • bp-groups/bp-groups-notifications.php

     
    1919                $group_link = site_url( $bp->groups->slug . '/' . $group->slug );
    2020                $settings_link = bp_core_get_user_domain( $user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    2121
    22                 $message = sprintf( __(
    23 'Group details for the group "%1$s" were updated:
     22                $message = sprintf( __( "Group details for the group \"%1$s\" were updated:\n\nTo view the group: %2$s\n\n---------------------\n", 'buddypress' ), $group->name, $group_link );
    2423
    25 To view the group: %2$s
    26 
    27 ---------------------
    28 ', 'buddypress' ), $group->name, $group_link );
    29 
    3024                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    3125
    3226                /* Send the message */
    … …  
    6559        $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
    6660        $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
    6761
    68 $message = sprintf( __(
    69 '%1$s wants to join the group "%2$s".
     62$message = sprintf( __( "%1$s wants to join the group \"%2$s\".\n\nBecause you are the administrator of this group, you must either accept or reject the membership request.\n\nTo view all pending membership requests for this group, please visit:\n%3$s\n\nTo view %4$s\'s profile: %5$s\n\n---------------------\n", 'buddypress' ), $requesting_user_name, $group->name, $group_requests, $requesting_user_name, $profile_link );
    7063
    71 Because you are the administrator of this group, you must either accept or reject the membership request.
    72 
    73 To view all pending membership requests for this group, please visit:
    74 %3$s
    75 
    76 To view %4$s\'s profile: %5$s
    77 
    78 ---------------------
    79 ', 'buddypress' ), $requesting_user_name, $group->name, $group_requests, $requesting_user_name, $profile_link );
    80 
    8164        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    8265
    8366        /* Send the message */
    … …  
    11598
    11699        if ( $accepted ) {
    117100                $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
    118                 $message = sprintf( __(
    119 'Your membership request for the group "%1$s" has been accepted.
     101                $message = sprintf( __( "Your membership request for the group \"%1$s\" has been accepted.\n\nTo view the group please login and visit: %2$s\n\n---------------------\n", 'buddypress' ), $group->name, $group_link );
    120102
    121 To view the group please login and visit: %2$s
    122 
    123 ---------------------
    124 ', 'buddypress' ), $group->name, $group_link );
    125 
    126103        } else {
    127104                $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
    128                 $message = sprintf( __(
    129 'Your membership request for the group "%1$s" has been rejected.
    130 
    131 To submit another request please log in and visit: %2$s
    132 
    133 ---------------------
    134 ', 'buddypress' ), $group->name, $group_link );
     105                $message = sprintf( __( "Your membership request for the group \"%1$s\" has been rejected.\n\nTo submit another request please log in and visit: %2$s\n\n---------------------\n", 'buddypress' ), $group->name, $group_link );
    135106        }
    136107
    137108        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    … …  
    174145        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    175146        $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
    176147
    177         $message = sprintf( __(
    178 'You have been promoted to %1$s for the group: "%2$s".
     148        $message = sprintf( __( "You have been promoted to %1$s for the group: \"%2$s\".\n\nTo view the group please visit: %3$s\n\n---------------------\n", 'buddypress' ), $promoted_to, $group->name, $group_link );
    179149
    180 To view the group please visit: %3$s
    181 
    182 ---------------------
    183 ', 'buddypress' ), $promoted_to, $group->name, $group_link );
    184 
    185150        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    186151
    187152        /* Send the message */
    … …  
    224189                $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    225190                $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
    226191
    227                 $message = sprintf( __(
    228 'One of your friends %1$s has invited you to the group: "%2$s".
     192                $message = sprintf( __( "One of your friends %1$s has invited you to the group: \"%2$s\".\n\nTo view your group invites visit: %3$s\n\nTo view the group visit: %4$s\n\nTo view %5$s\'s profile visit: %6$s\n\n---------------------\n", 'buddypress' ), $inviter_name, $group->name, $invites_link, $group_link, $inviter_name, $inviter_link );
    229193
    230 To view your group invites visit: %3$s
    231 
    232 To view the group visit: %4$s
    233 
    234 To view %5$s\'s profile visit: %6$s
    235 
    236 ---------------------
    237 ', 'buddypress' ), $inviter_name, $group->name, $invites_link, $group_link, $inviter_name, $inviter_link );
    238 
    239194                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    240195
    241196                /* Send the message */
    … …  
    286241                        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    287242                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name );
    288243
    289 $message = sprintf( __(
    290 '%1$s mentioned you in the group "%2$s":
     244$message = sprintf( __( "%1$s mentioned you in the group \"%2$s\":\n\n\"%3$s\"\n\nTo view and respond to the message, log in and visit: %4$s\n\n---------------------\n", 'buddypress' ), $poster_name, $group->name, $content, $message_link );
    291245
    292 "%3$s"
    293 
    294 To view and respond to the message, log in and visit: %4$s
    295 
    296 ---------------------
    297 ', 'buddypress' ), $poster_name, $group->name, $content, $message_link );
    298 
    299246                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    300247
    301248                        /* Send the message */