Ticket #2291: patch_2291-2.patch
| File patch_2291-2.patch, 45.6 KB (added by , 16 years ago) |
|---|
-
bp-friends.php
423 423 friends_record_activity( array( 424 424 'user_id' => $friendship->initiator_user_id, 425 425 'type' => 'friendship_created', 426 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '% s and %s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),426 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ), 427 427 'item_id' => $friendship_id 428 428 ) ); 429 429 … … 431 431 friends_record_activity( array( 432 432 'user_id' => $friendship->friend_user_id, 433 433 'type' => 'friendship_created', 434 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '% s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),434 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ), 435 435 'item_id' => $friendship_id, 436 436 'hide_sitewide' => true /* We've already got the first entry site wide */ 437 437 ) ); -
bp-themes/bp-default/groups/single/forum/topic.php
31 31 <a href="<?php bp_the_topic_post_poster_link() ?>"> 32 32 <?php bp_the_topic_post_poster_avatar( 'width=40&height=40' ) ?> 33 33 </a> 34 <?php echo sprintf( __( '% s said %s ago:', 'buddypress' ), bp_get_the_topic_post_poster_name(), bp_get_the_topic_post_time_since() ) ?>34 <?php echo sprintf( __( '%1$s said %2$s ago:', 'buddypress' ), bp_get_the_topic_post_poster_name(), bp_get_the_topic_post_time_since() ) ?> 35 35 </div> 36 36 37 37 <div class="post-content"> -
bp-themes/bp-default/members/single/groups/invites.php
8 8 9 9 <li> 10 10 <?php bp_group_avatar_thumb() ?> 11 <h4><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a><span class="small"> - <?php printf( __( '% smembers', 'buddypress' ), bp_group_total_members( false ) ) ?></span></h4>11 <h4><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a><span class="small"> - <?php printf( __( '%d members', 'buddypress' ), bp_group_total_members( false ) ) ?></span></h4> 12 12 13 13 <p class="desc"> 14 14 <?php bp_group_description_excerpt() ?> -
bp-themes/bp-default/members/single/messages/single.php
8 8 9 9 <p id="message-recipients"> 10 10 <span class="highlight"> 11 <?php printf( __('Sent between % s and %s', 'buddypress'), bp_get_the_thread_recipients(), '<a href="' . bp_get_loggedin_user_link() . '" title="' . bp_get_loggedin_user_fullname() . '">' . bp_get_loggedin_user_fullname() . '</a>' ) ?>11 <?php printf( __('Sent between %1$s and %2$s', 'buddypress'), bp_get_the_thread_recipients(), '<a href="' . bp_get_loggedin_user_link() . '" title="' . bp_get_loggedin_user_fullname() . '">' . bp_get_loggedin_user_fullname() . '</a>' ) ?> 12 12 </span> 13 13 </p> 14 14 -
bp-themes/bp-default/members/index.php
15 15 16 16 <div class="item-list-tabs"> 17 17 <ul> 18 <li class="selected" id="members-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (% s)', 'buddypress' ), bp_get_total_member_count() ) ?></a></li>18 <li class="selected" id="members-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%d)', 'buddypress' ), bp_get_total_member_count() ) ?></a></li> 19 19 20 20 <?php if ( is_user_logged_in() && function_exists( 'bp_get_total_friend_count' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?> 21 <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (% s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>21 <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%d)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li> 22 22 <?php endif; ?> 23 23 24 24 <?php do_action( 'bp_members_directory_member_types' ) ?> -
bp-themes/bp-default/activity/post-form.php
16 16 17 17 <h5> 18 18 <?php if ( bp_is_group() ) : ?> 19 <?php printf( __( "What's new in % s, %s?", 'buddypress' ), bp_get_group_name(), bp_get_user_firstname() ) ?>19 <?php printf( __( "What's new in %1$s, %2$s?", 'buddypress' ), bp_get_group_name(), bp_get_user_firstname() ) ?> 20 20 <?php else : ?> 21 21 <?php printf( __( "What's new %s?", 'buddypress' ), bp_get_user_firstname() ) ?> 22 22 <?php endif; ?> -
bp-themes/bp-default/functions.php
208 208 /* Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html) */ 209 209 function bp_dtheme_show_notice() { ?> 210 210 <div id="message" class="updated fade"> 211 <p><?php printf( __( 'Theme activated! This theme contains <a href="% s">custom header image</a> support and <a href="%s">sidebar widgets</a>.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?></p>211 <p><?php printf( __( 'Theme activated! This theme contains <a href="%1$s">custom header image</a> support and <a href="%2$s">sidebar widgets</a>.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?></p> 212 212 </div> 213 213 214 214 <style type="text/css">#message2, #message0 { display: none; }</style> … … 227 227 var bp_terms_show_all = '<?php _e( "Show all", "buddypress" ) ?>'; 228 228 var bp_terms_comments = '<?php _e( "comments", "buddypress" ) ?>'; 229 229 var bp_terms_close = '<?php _e( "Close", "buddypress" ) ?>'; 230 var bp_terms_mention_explain = '<?php printf( __( "% s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", "buddypress" ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname(bp_get_displayed_user_fullname()), bp_get_user_firstname(bp_get_displayed_user_fullname()) ); ?>';230 var bp_terms_mention_explain = '<?php printf( __( "%1$s is a unique identifier for %2$s that you can type into any message on this site. %3$s will be sent a notification and a link to your message any time you use it.", "buddypress" ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname(bp_get_displayed_user_fullname()), bp_get_user_firstname(bp_get_displayed_user_fullname()) ); ?>'; 231 231 </script> 232 232 <?php 233 233 } -
bp-core/bp-core-filters.php
161 161 162 162 $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) ); 163 163 $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 164 $message = sprintf(__("Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n% s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%s", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}" ) );164 $message = sprintf(__("Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%1$s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%2$s", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}" ) ); 165 165 $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), clean_url('http://' . $domain . $path)); 166 166 167 167 /* Send the message */ -
bp-core/bp-core-templatetags.php
181 181 $total = bp_core_number_format( $members_template->total_member_count ); 182 182 183 183 if ( 'active' == $members_template->type ) 184 echo sprintf( __( 'Viewing member % s to %s (of %sactive members)', 'buddypress' ), $from_num, $to_num, $total );184 echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d active members)', 'buddypress' ), $from_num, $to_num, $total ); 185 185 else if ( 'popular' == $members_template->type ) 186 echo sprintf( __( 'Viewing member % s to %s (of %smembers with friends)', 'buddypress' ), $from_num, $to_num, $total );186 echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members with friends)', 'buddypress' ), $from_num, $to_num, $total ); 187 187 else if ( 'online' == $members_template->type ) 188 echo sprintf( __( 'Viewing member % s to %s (of %smembers online)', 'buddypress' ), $from_num, $to_num, $total );188 echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members online)', 'buddypress' ), $from_num, $to_num, $total ); 189 189 else 190 echo sprintf( __( 'Viewing member % s to %s (of %smembers)', 'buddypress' ), $from_num, $to_num, $total );190 echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members)', 'buddypress' ), $from_num, $to_num, $total ); 191 191 192 192 ?><span class="ajax-loader"></span><?php 193 193 } -
bp-friends/bp-friends-notifications.php
21 21 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name ); 22 22 23 23 $message = sprintf( __( 24 "% s wants to add you as a friend.24 "%1$s wants to add you as a friend. 25 25 26 To view all of your pending friendship requests: % s26 To view all of your pending friendship requests: %2$s 27 27 28 To view % s's profile: %s28 To view %3$s's profile: %4$s 29 29 30 30 --------------------- 31 31 ", 'buddypress' ), $initiator_name, $all_requests_link, $initiator_name, $initiator_link ); … … 60 60 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name ); 61 61 62 62 $message = sprintf( __( 63 '% s accepted your friend request.63 '%1$s accepted your friend request. 64 64 65 To view % s\'s profile: %s65 To view %2$s\'s profile: %3$s 66 66 67 67 --------------------- 68 68 ', 'buddypress' ), $friend_name, $friend_name, $friend_link ); -
bp-activity/bp-activity-notifications.php
31 31 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name ); 32 32 33 33 $message = sprintf( __( 34 '% s mentioned you in an update:34 '%1$s mentioned you in an update: 35 35 36 "% s"36 "%2$s" 37 37 38 To view and respond to the message, log in and visit: % s38 To view and respond to the message, log in and visit: %3$s 39 39 40 40 --------------------- 41 41 ', 'buddypress' ), $poster_name, $content, $message_link ); … … 74 74 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name ); 75 75 76 76 $message = sprintf( __( 77 '% s replied to one of your updates:77 '%1$s replied to one of your updates: 78 78 79 "% s"79 "%2$s" 80 80 81 To view your original update and all comments, log in and visit: % s81 To view your original update and all comments, log in and visit: %3$s 82 82 83 83 --------------------- 84 84 ', 'buddypress' ), $poster_name, $content, $thread_link ); … … 116 116 $content = bp_activity_filter_kses( stripslashes( $content ) ); 117 117 118 118 $message = sprintf( __( 119 '% s replied to one of your comments:119 '%1$s replied to one of your comments: 120 120 121 "% s"121 "%2$s" 122 122 123 To view the original activity, your comment and all replies, log in and visit: % s123 To view the original activity, your comment and all replies, log in and visit: %3$s 124 124 125 125 --------------------- 126 126 ', 'buddypress' ), $poster_name, $content, $thread_link ); -
bp-activity/bp-activity-templatetags.php
269 269 $to_num = bp_core_number_format( ( $from_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1 ) ); 270 270 $total = bp_core_number_format( $activities_template->total_activity_count ); 271 271 272 return sprintf( __( 'Viewing item % s to %s (of %sitems)', 'buddypress' ), $from_num, $to_num, $total ) . ' <span class="ajax-loader"></span>';272 return sprintf( __( 'Viewing item %1$d to %2$d (of %3$d items)', 'buddypress' ), $from_num, $to_num, $total ) . ' <span class="ajax-loader"></span>'; 273 273 } 274 274 275 275 function bp_activity_pagination_links() { -
bp-blogs.php
345 345 /* Record this in activity streams */ 346 346 bp_blogs_record_activity( array( 347 347 'user_id' => $recorded_blog->user_id, 348 'action' => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '% s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ),348 'action' => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%1$s created the blog %2$s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_blog_option( $recorded_blog->blog_id, 'siteurl' ) . '">' . attribute_escape( $name ) . '</a>' ), &$recorded_blog, $name, $description ), 349 349 'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_blog_option( $recorded_blog->blog_id, 'siteurl' ), $recorded_blog->blog_id ), 350 350 'type' => 'new_blog', 351 351 'item_id' => $recorded_blog->blog_id … … 380 380 /* Record this in activity streams */ 381 381 $post_permalink = get_permalink( $post_id ); 382 382 383 $activity_action = sprintf( __( '% s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );383 $activity_action = sprintf( __( '%1$s wrote a new blog post: %2$s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' ); 384 384 $activity_content = $post->post_content; 385 385 386 386 bp_blogs_record_activity( array( … … 427 427 if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) { 428 428 /* Record in activity streams */ 429 429 $comment_link = get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment_id; 430 $activity_action = sprintf( __( '% s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );430 $activity_action = sprintf( __( '%1$s commented on the blog post %2$s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' ); 431 431 $activity_content = $comment->comment_content; 432 432 433 433 /* Record this in activity streams */ -
bp-messages.php
368 368 369 369 if ( 'new_message' == $action ) { 370 370 if ( (int)$total_items > 1 ) 371 return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title=" Inbox">' . sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );371 return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="' . __( 'Inbox', 'buddypress' ) . '">' . sprintf( __( 'You have %d new messages', 'buddypress' ), (int)$total_items ) . '</a>', $total_items ); 372 372 else 373 return apply_filters( 'bp_messages_single_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title=" Inbox">' . sprintf( __('You have %d new message', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );373 return apply_filters( 'bp_messages_single_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="' . __( 'Inbox', 'buddypress' ) . '">' . sprintf( __( 'You have %d new message', 'buddypress' ), (int)$total_items ) . '</a>', $total_items ); 374 374 } 375 375 376 376 do_action( 'messages_format_notifications', $action, $item_id, $secondary_item_id, $total_items ); -
bp-groups.php
298 298 $group = new BP_Groups_Group( $group_id ); 299 299 300 300 groups_record_activity( array( 301 'action' => apply_filters( 'groups_activity_accepted_invite_action', sprintf( __( '% s joined the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ),301 'action' => apply_filters( 'groups_activity_accepted_invite_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $bp->loggedin_user->id, &$group ), 302 302 'type' => 'joined_group', 303 303 'item_id' => $group->id 304 304 ) ); … … 1120 1120 1121 1121 /* Once we compelete all steps, record the group creation in the activity stream. */ 1122 1122 groups_record_activity( array( 1123 'action' => apply_filters( 'groups_activity_created_group_action', sprintf( __( '% s created the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),1123 'action' => apply_filters( 'groups_activity_created_group_action', sprintf( __( '%1$s created the group %2$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ), 1124 1124 'type' => 'created_group', 1125 1125 'item_id' => $bp->groups->new_group_id 1126 1126 ) ); … … 1329 1329 $group_link = bp_get_group_permalink( $group ); 1330 1330 1331 1331 if ( (int)$total_items > 1 ) { 1332 return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/?n=1" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('% d new membership requests for the group "%s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );1332 return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/?n=1" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%1$d new membership requests for the group "%2$s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name ); 1333 1333 } else { 1334 1334 $user_fullname = bp_core_get_user_displayname( $requesting_user_id ); 1335 return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . 'admin/membership-requests/?n=1" title="' . $user_fullname .' requests group membership">' . sprintf( __('% s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );1335 return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . 'admin/membership-requests/?n=1" title="' . $user_fullname .' requests group membership">' . sprintf( __('%1$s requests membership for the group "%1$s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name ); 1336 1336 } 1337 1337 break; 1338 1338 … … 1345 1345 if ( (int)$total_items > 1 ) { 1346 1346 return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name ); 1347 1347 } else { 1348 return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name );1348 return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'Membership for group "%s" accepted', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name ); 1349 1349 } 1350 1350 break; 1351 1351 … … 1358 1358 if ( (int)$total_items > 1 ) { 1359 1359 return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . BP_MEMBERS_SLUG . '/' . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name ); 1360 1360 } else { 1361 return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name );1361 return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'Membership for group "%s" rejected', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name ); 1362 1362 } 1363 1363 1364 1364 break; … … 1370 1370 $group_link = bp_get_group_permalink( $group ); 1371 1371 1372 1372 if ( (int)$total_items > 1 ) { 1373 return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __( 'You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );1373 return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __( 'You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items ); 1374 1374 } else { 1375 return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name );1375 return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'You were promoted to an admin in the group %s', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name ); 1376 1376 } 1377 1377 break; 1378 1378 … … 1383 1383 $group_link = bp_get_group_permalink( $group ); 1384 1384 1385 1385 if ( (int)$total_items > 1 ) { 1386 return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __( 'You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );1386 return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __( 'You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items ); 1387 1387 } else { 1388 return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name );1388 return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '?n=1">' . sprintf( __( 'You were promoted to a mod in the group %s', 'buddypress' ), $group->name ) . '</a>', $group_link, $group->name ); 1389 1389 } 1390 1390 break; 1391 1391 … … 1396 1396 $user_url = bp_core_get_user_domain( $user_id ); 1397 1397 1398 1398 if ( (int)$total_items > 1 ) { 1399 return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __( 'You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );1399 return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __( 'You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items ); 1400 1400 } else { 1401 return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __( 'You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );1401 return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __( 'You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name ); 1402 1402 } 1403 1403 break; 1404 1404 } … … 1693 1693 1694 1694 /* Record this in activity streams */ 1695 1695 groups_record_activity( array( 1696 'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '% s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ),1696 'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ) ), 1697 1697 'type' => 'joined_group', 1698 1698 'item_id' => $group_id 1699 1699 ) ); … … 1869 1869 return false; 1870 1870 1871 1871 /* Record this in activity streams */ 1872 $activity_action = sprintf( __( '% s posted an update in the group %s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );1872 $activity_action = sprintf( __( '%1$s posted an update in the group %2$s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ); 1873 1873 $activity_content = $content; 1874 1874 1875 1875 $activity_id = groups_record_activity( array( … … 1922 1922 if ( $post_id = bp_forums_insert_post( array( 'post_text' => $post_text, 'topic_id' => $topic_id ) ) ) { 1923 1923 $topic = bp_forums_get_topic_details( $topic_id ); 1924 1924 1925 $activity_action = sprintf( __( '% s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );1925 $activity_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ); 1926 1926 $activity_content = bp_create_excerpt( $post_text ); 1927 1927 $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/'; 1928 1928 … … 1961 1961 if ( $topic_id = bp_forums_new_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_tags' => $topic_tags, 'forum_id' => $forum_id ) ) ) { 1962 1962 $topic = bp_forums_get_topic_details( $topic_id ); 1963 1963 1964 $activity_action = sprintf( __( '% s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );1964 $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ); 1965 1965 $activity_content = bp_create_excerpt( $topic_text ); 1966 1966 1967 1967 /* Record this in activity streams */ … … 1993 1993 if ( function_exists( 'bp_activity_delete_by_item_id' ) ) 1994 1994 bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) ); 1995 1995 1996 $activity_action = sprintf( __( '% s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );1996 $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ); 1997 1997 $activity_content = bp_create_excerpt( $topic_text ); 1998 1998 1999 1999 /* Record this in activity streams */ … … 2027 2027 if ( $post_id = bp_forums_insert_post( array( 'post_id' => $post_id, 'post_text' => $post_text, 'post_time' => $post->post_time, 'topic_id' => $topic_id, 'poster_id' => $post->poster_id ) ) ) { 2028 2028 $topic = bp_forums_get_topic_details( $topic_id ); 2029 2029 2030 $activity_action = sprintf( __( '% s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );2030 $activity_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' ); 2031 2031 $activity_content = bp_create_excerpt( $post_text ); 2032 2032 $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/'; 2033 2033 … … 2348 2348 $group = new BP_Groups_Group( $group_id ); 2349 2349 2350 2350 groups_record_activity( array( 2351 'action' => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '% s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $user_id, &$group ),2351 'action' => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . attribute_escape( $group->name ) . '</a>' ), $user_id, &$group ), 2352 2352 'type' => 'joined_group', 2353 2353 'item_id' => $group->id, 2354 2354 'user_id' => $user_id -
bp-blogs/bp-blogs-templatetags.php
166 166 $to_num = bp_core_number_format( ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) ); 167 167 $total = bp_core_number_format( $blogs_template->total_blog_count ); 168 168 169 echo sprintf( __( 'Viewing blog % s to %s (of %sblogs)', 'buddypress' ), $from_num, $to_num, $total ); ?> 169 echo sprintf( __( 'Viewing blog %1$d to %2$d (of %3$d blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?> 170 170 <span class="ajax-loader"></span><?php 171 171 } 172 172 -
bp-messages/bp-messages-notifications.php
22 22 $email_subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name ); 23 23 24 24 $email_content = sprintf( __( 25 '% s sent you a new message:25 '%1$s sent you a new message: 26 26 27 Subject: % s27 Subject: %2$s 28 28 29 "% s"29 "%3$s" 30 30 31 To view and read your messages please log in and visit: % s31 To view and read your messages please log in and visit: %4$s 32 32 33 33 --------------------- 34 34 ', 'buddypress' ), $sender_name, $subject, $content, $message_link ); -
bp-messages/bp-messages-templatetags.php
312 312 $to_num = bp_core_number_format( ( $from_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $from_num + ( $messages_template->pag_num - 1 ) ); 313 313 $total = bp_core_number_format( $messages_template->total_thread_count ); 314 314 315 echo sprintf( __( 'Viewing message % s to %s (of %smessages)', 'buddypress' ), $from_num, $to_num, $total ); ?> 315 echo sprintf( __( 'Viewing message %1$d to %2$d (of %3$d messages)', 'buddypress' ), $from_num, $to_num, $total ); ?> 316 316 <span class="ajax-loader"></span><?php 317 317 } 318 318 -
bp-forums/bp-forums-templatetags.php
671 671 if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) ) 672 672 $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms ); 673 673 674 echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic % s to %s (%stotal topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) );674 echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %1$d to %2$d (%3$d total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) ); 675 675 ?> 676 676 <span class="ajax-loader"></span> 677 677 <?php … … 955 955 $from_num = intval( ( $topic_template->pag_page - 1 ) * $topic_template->pag_num ) + 1; 956 956 $to_num = ( $from_num + ( $topic_template->pag_num - 1 ) > $topic_template->total_post_count ) ? $topic_template->total_post_count : $from_num + ( $topic_template->pag_num - 1 ); 957 957 958 echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post % d to %d (%d total posts)', 'buddypress' ), $from_num, $to_num, $topic_template->total_post_count ) );958 echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post %1$d to %2$d (%3$d total posts)', 'buddypress' ), $from_num, $to_num, $topic_template->total_post_count ) ); 959 959 ?> 960 960 <span class="ajax-loader"></span> 961 961 <?php -
bp-core.php
1997 1997 /* The best way to remove this notice is to add a "buddypress" tag to your active theme's CSS header. */ 1998 1998 if ( !defined( 'BP_SILENCE_THEME_NOTICE' ) && !in_array( 'buddypress', (array)$ct->tags ) ) { ?> 1999 1999 <div id="message" class="updated fade"> 2000 <p style="line-height: 150%"><?php printf( __( "<strong>BuddyPress is ready</strong>. You'll need to <a href='% s'>activate a BuddyPress compatible theme</a> to take advantage of all of the features. We've bundled a default theme, but you can always <a href='%s'>install some other compatible themes</a> or <a href='%s'>upgrade your existing WordPress theme</a>.", 'buddypress' ), admin_url( 'themes.php' ), admin_url( 'theme-install.php?type=tag&s=buddypress&tab=search' ), admin_url( 'plugin-install.php?type=term&tab=search&s=bp-template-pack' ) ) ?></p>2000 <p style="line-height: 150%"><?php printf( __( "<strong>BuddyPress is ready</strong>. You'll need to <a href='%1$s'>activate a BuddyPress compatible theme</a> to take advantage of all of the features. We've bundled a default theme, but you can always <a href='%2$s'>install some other compatible themes</a> or <a href='%3$s'>upgrade your existing WordPress theme</a>.", 'buddypress' ), admin_url( 'themes.php' ), admin_url( 'theme-install.php?type=tag&s=buddypress&tab=search' ), admin_url( 'plugin-install.php?type=term&tab=search&s=bp-template-pack' ) ) ?></p> 2001 2001 </div><?php 2002 2002 } 2003 2003 } -
bp-groups/bp-groups-notifications.php
19 19 $settings_link = bp_core_get_user_domain( $user_id ) . BP_SETTINGS_SLUG . '/notifications/'; 20 20 21 21 $message = sprintf( __( 22 'Group details for the group "% s" were updated:22 'Group details for the group "%1$s" were updated: 23 23 24 To view the group: % s24 To view the group: %2$s 25 25 26 26 --------------------- 27 27 ', 'buddypress' ), $group->name, $group_link ); … … 62 62 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name ); 63 63 64 64 $message = sprintf( __( 65 '% s wants to join the group "%s".65 '%1$s wants to join the group "%2$s". 66 66 67 67 Because you are the administrator of this group, you must either accept or reject the membership request. 68 68 69 69 To view all pending membership requests for this group, please visit: 70 % s70 %3$s 71 71 72 To view % s\'s profile: %s72 To view %4$s\'s profile: %5$s 73 73 74 74 --------------------- 75 75 ', 'buddypress' ), $requesting_user_name, $group->name, $group_requests, $requesting_user_name, $profile_link ); … … 109 109 if ( $accepted ) { 110 110 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name ); 111 111 $message = sprintf( __( 112 'Your membership request for the group "% s" has been accepted.112 'Your membership request for the group "%1$s" has been accepted. 113 113 114 To view the group please login and visit: % s114 To view the group please login and visit: %2$s 115 115 116 116 --------------------- 117 117 ', 'buddypress' ), $group->name, $group_link ); … … 119 119 } else { 120 120 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name ); 121 121 $message = sprintf( __( 122 'Your membership request for the group "% s" has been rejected.122 'Your membership request for the group "%1$s" has been rejected. 123 123 124 To submit another request please log in and visit: % s124 To submit another request please log in and visit: %2$s 125 125 126 126 --------------------- 127 127 ', 'buddypress' ), $group->name, $group_link ); … … 166 166 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name ); 167 167 168 168 $message = sprintf( __( 169 'You have been promoted to % s for the group: "%s".169 'You have been promoted to %1$s for the group: "%2$s". 170 170 171 To view the group please visit: % s171 To view the group please visit: %3$s 172 172 173 173 --------------------- 174 174 ', 'buddypress' ), $promoted_to, $group->name, $group_link ); … … 214 214 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name ); 215 215 216 216 $message = sprintf( __( 217 'One of your friends % s has invited you to the group: "%s".217 'One of your friends %1$s has invited you to the group: "%2$s". 218 218 219 To view your group invites visit: % s219 To view your group invites visit: %3$s 220 220 221 To view the group visit: % s221 To view the group visit: %4$s 222 222 223 To view % s\'s profile visit: %s223 To view %5$s\'s profile visit: %6$s 224 224 225 225 --------------------- 226 226 ', 'buddypress' ), $inviter_name, $group->name, $invites_link, $group_link, $inviter_name, $inviter_link ); … … 270 270 // Set up and send the message 271 271 $ud = bp_core_get_core_userdata( $receiver_user_id ); 272 272 $to = $ud->user_email; 273 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '% s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );273 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name ); 274 274 275 275 $message = sprintf( __( 276 '% s mentioned you in the group "%s":276 '%1$s mentioned you in the group "%2$s": 277 277 278 "% s"278 "%3$s" 279 279 280 To view and respond to the message, log in and visit: % s280 To view and respond to the message, log in and visit: %4$s 281 281 282 282 --------------------- 283 283 ', 'buddypress' ), $poster_name, $group->name, $content, $message_link ); -
bp-groups/bp-groups-templatetags.php
555 555 $to_num = bp_core_number_format( ( $from_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $from_num + ( $groups_template->pag_num - 1 ) ); 556 556 $total = bp_core_number_format( $groups_template->total_group_count ); 557 557 558 echo sprintf( __( 'Viewing group % s to %s (of %sgroups)', 'buddypress' ), $from_num, $to_num, $total ); ?> 558 echo sprintf( __( 'Viewing group %1$d to %2$d (of %3$d groups)', 'buddypress' ), $from_num, $to_num, $total ); ?> 559 559 <span class="ajax-loader"></span><?php 560 560 } 561 561 … … 1407 1407 $to_num = bp_core_number_format( ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 ) ); 1408 1408 $total = bp_core_number_format( $members_template->total_member_count ); 1409 1409 1410 return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members % s to %s (of %smembers)', 'buddypress' ), $from_num, $to_num, $total ) );1410 return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %1$d to %2$d (of %3$d members)', 'buddypress' ), $from_num, $to_num, $total ) ); 1411 1411 } 1412 1412 1413 1413 function bp_group_member_admin_pagination() {