-
+-
Index: bp-themes/bp-default/members/single/messages/single.php =================================================================== --- bp-themes/bp-default/members/single/messages/single.php (revision 2904) +++ bp-themes/bp-default/members/single/messages/single.php (working copy) @@ -8,7 +8,7 @@
- ' . bp_get_loggedin_user_fullname() . '' ) ?> + ' . bp_get_loggedin_user_fullname() . '' ) ?>
Index: bp-themes/bp-default/members/index.php =================================================================== --- bp-themes/bp-default/members/index.php (revision 2904) +++ bp-themes/bp-default/members/index.php (working copy) @@ -15,10 +15,10 @@-
-
- +
- -
- +
- Index: bp-themes/bp-default/activity/post-form.php =================================================================== --- bp-themes/bp-default/activity/post-form.php (revision 2904) +++ bp-themes/bp-default/activity/post-form.php (working copy) @@ -16,7 +16,7 @@
-
+
Index: bp-themes/bp-default/functions.php
===================================================================
--- bp-themes/bp-default/functions.php (revision 2904)
+++ bp-themes/bp-default/functions.php (working copy)
@@ -208,7 +208,7 @@
/* Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html) */
function bp_dtheme_show_notice() { ?>
- custom header image support and sidebar widgets.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?>
+ custom header image support and sidebar widgets.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?>
@@ -227,7 +227,7 @@
var bp_terms_show_all = '';
var bp_terms_comments = '';
var bp_terms_close = '';
- var bp_terms_mention_explain = '';
+ var bp_terms_mention_explain = '';
\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
- $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}" ) );
+ $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}" ) );
$subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), clean_url('http://' . $domain . $path));
/* Send the message */
Index: bp-core/bp-core-templatetags.php
===================================================================
--- bp-core/bp-core-templatetags.php (revision 2904)
+++ bp-core/bp-core-templatetags.php (working copy)
@@ -181,13 +181,13 @@
$total = bp_core_number_format( $members_template->total_member_count );
if ( 'active' == $members_template->type )
- echo sprintf( __( 'Viewing member %s to %s (of %s active members)', 'buddypress' ), $from_num, $to_num, $total );
+ echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d active members)', 'buddypress' ), $from_num, $to_num, $total );
else if ( 'popular' == $members_template->type )
- echo sprintf( __( 'Viewing member %s to %s (of %s members with friends)', 'buddypress' ), $from_num, $to_num, $total );
+ echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members with friends)', 'buddypress' ), $from_num, $to_num, $total );
else if ( 'online' == $members_template->type )
- echo sprintf( __( 'Viewing member %s to %s (of %s members online)', 'buddypress' ), $from_num, $to_num, $total );
+ echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members online)', 'buddypress' ), $from_num, $to_num, $total );
else
- echo sprintf( __( 'Viewing member %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total );
+ echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members)', 'buddypress' ), $from_num, $to_num, $total );
?>pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1 ) );
$total = bp_core_number_format( $activities_template->total_activity_count );
- return sprintf( __( 'Viewing item %s to %s (of %s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' ';
+ return sprintf( __( 'Viewing item %1$d to %2$d (of %3$d items)', 'buddypress' ), $from_num, $to_num, $total ) . ' ';
}
function bp_activity_pagination_links() {
Index: bp-blogs.php
===================================================================
--- bp-blogs.php (revision 2904)
+++ bp-blogs.php (working copy)
@@ -345,7 +345,7 @@
/* Record this in activity streams */
bp_blogs_record_activity( array(
'user_id' => $recorded_blog->user_id,
- 'action' => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '' . attribute_escape( $name ) . '' ), &$recorded_blog, $name, $description ),
+ '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 ), '' . attribute_escape( $name ) . '' ), &$recorded_blog, $name, $description ),
'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_blog_option( $recorded_blog->blog_id, 'siteurl' ), $recorded_blog->blog_id ),
'type' => 'new_blog',
'item_id' => $recorded_blog->blog_id
@@ -380,7 +380,7 @@
/* Record this in activity streams */
$post_permalink = get_permalink( $post_id );
- $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '' . $post->post_title . '' );
+ $activity_action = sprintf( __( '%1$s wrote a new blog post: %2$s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '' . $post->post_title . '' );
$activity_content = $post->post_content;
bp_blogs_record_activity( array(
@@ -427,7 +427,7 @@
if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
/* Record in activity streams */
$comment_link = get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment_id;
- $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '' . $comment->post->post_title . '' );
+ $activity_action = sprintf( __( '%1$s commented on the blog post %2$s', 'buddypress' ), bp_core_get_userlink( $user_id ), '' . $comment->post->post_title . '' );
$activity_content = $comment->comment_content;
/* Record this in activity streams */
Index: bp-messages.php
===================================================================
--- bp-messages.php (revision 2904)
+++ bp-messages.php (working copy)
@@ -368,9 +368,9 @@
if ( 'new_message' == $action ) {
if ( (int)$total_items > 1 )
- return apply_filters( 'bp_messages_multiple_new_message_notification', '' . sprintf( __('You have %d new messages', 'buddypress' ), (int)$total_items ) . '', $total_items );
+ return apply_filters( 'bp_messages_multiple_new_message_notification', '' . sprintf( __( 'You have %d new messages', 'buddypress' ), (int)$total_items ) . '', $total_items );
else
- return apply_filters( 'bp_messages_single_new_message_notification', '' . sprintf( __('You have %d new message', 'buddypress' ), (int)$total_items ) . '', $total_items );
+ return apply_filters( 'bp_messages_single_new_message_notification', '' . sprintf( __( 'You have %d new message', 'buddypress' ), (int)$total_items ) . '', $total_items );
}
do_action( 'messages_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
Index: bp-groups.php
===================================================================
--- bp-groups.php (revision 2904)
+++ bp-groups.php (working copy)
@@ -298,7 +298,7 @@
$group = new BP_Groups_Group( $group_id );
groups_record_activity( array(
- 'action' => apply_filters( 'groups_activity_accepted_invite_action', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '' . attribute_escape( $group->name ) . '' ), $bp->loggedin_user->id, &$group ),
+ '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 ), '' . attribute_escape( $group->name ) . '' ), $bp->loggedin_user->id, &$group ),
'type' => 'joined_group',
'item_id' => $group->id
) );
@@ -1120,7 +1120,7 @@
/* Once we compelete all steps, record the group creation in the activity stream. */
groups_record_activity( array(
- 'action' => apply_filters( 'groups_activity_created_group_action', sprintf( __( '%s created the group %s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '' . attribute_escape( $bp->groups->current_group->name ) . '' ) ),
+ '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 ), '' . attribute_escape( $bp->groups->current_group->name ) . '' ) ),
'type' => 'created_group',
'item_id' => $bp->groups->new_group_id
) );
@@ -1329,10 +1329,10 @@
$group_link = bp_get_group_permalink( $group );
if ( (int)$total_items > 1 ) {
- return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '' . sprintf( __('%d new membership requests for the group "%s"', 'buddypress' ), (int)$total_items, $group->name ) . '', $group_link, $total_items, $group->name );
+ return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '' . sprintf( __('%1$d new membership requests for the group "%2$s"', 'buddypress' ), (int)$total_items, $group->name ) . '', $group_link, $total_items, $group->name );
} else {
$user_fullname = bp_core_get_user_displayname( $requesting_user_id );
- return apply_filters( 'bp_groups_single_new_membership_request_notification', '' . sprintf( __('%s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '', $group_link, $user_fullname, $group->name );
+ return apply_filters( 'bp_groups_single_new_membership_request_notification', '' . sprintf( __('%1$s requests membership for the group "%1$s"', 'buddypress' ), $user_fullname, $group->name ) . '', $group_link, $user_fullname, $group->name );
}
break;
@@ -1345,7 +1345,7 @@
if ( (int)$total_items > 1 ) {
return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '', $total_items, $group_name );
} else {
- return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '', $group_link, $group->name );
+ return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '' . sprintf( __( 'Membership for group "%s" accepted', 'buddypress' ), $group->name ) . '', $group_link, $group->name );
}
break;
@@ -1358,7 +1358,7 @@
if ( (int)$total_items > 1 ) {
return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '', $total_items, $group->name );
} else {
- return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '', $group_link, $group->name );
+ return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '' . sprintf( __( 'Membership for group "%s" rejected', 'buddypress' ), $group->name ) . '', $group_link, $group->name );
}
break;
@@ -1370,9 +1370,9 @@
$group_link = bp_get_group_permalink( $group );
if ( (int)$total_items > 1 ) {
- return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '', $total_items );
+ return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '' . sprintf( __( 'You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '', $total_items );
} else {
- return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '', $group_link, $group->name );
+ return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '' . sprintf( __( 'You were promoted to an admin in the group %s', 'buddypress' ), $group->name ) . '', $group_link, $group->name );
}
break;
@@ -1383,9 +1383,9 @@
$group_link = bp_get_group_permalink( $group );
if ( (int)$total_items > 1 ) {
- return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '', $total_items );
+ return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '' . sprintf( __( 'You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '', $total_items );
} else {
- return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '', $group_link, $group->name );
+ return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '' . sprintf( __( 'You were promoted to a mod in the group %s', 'buddypress' ), $group->name ) . '', $group_link, $group->name );
}
break;
@@ -1396,9 +1396,9 @@
$user_url = bp_core_get_user_domain( $user_id );
if ( (int)$total_items > 1 ) {
- return apply_filters( 'bp_groups_multiple_group_invite_notification', '' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '', $total_items );
+ return apply_filters( 'bp_groups_multiple_group_invite_notification', '' . sprintf( __( 'You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '', $total_items );
} else {
- return apply_filters( 'bp_groups_single_group_invite_notification', '' . sprintf( __('You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '', $group->name );
+ return apply_filters( 'bp_groups_single_group_invite_notification', '' . sprintf( __( 'You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '', $group->name );
}
break;
}
@@ -1693,7 +1693,7 @@
/* Record this in activity streams */
groups_record_activity( array(
- 'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '' . attribute_escape( $bp->groups->current_group->name ) . '' ) ),
+ 'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '' . attribute_escape( $bp->groups->current_group->name ) . '' ) ),
'type' => 'joined_group',
'item_id' => $group_id
) );
@@ -1869,7 +1869,7 @@
return false;
/* Record this in activity streams */
- $activity_action = sprintf( __( '%s posted an update in the group %s:', 'buddypress'), bp_core_get_userlink( $user_id ), '' . attribute_escape( $bp->groups->current_group->name ) . '' );
+ $activity_action = sprintf( __( '%1$s posted an update in the group %2$s:', 'buddypress'), bp_core_get_userlink( $user_id ), '' . attribute_escape( $bp->groups->current_group->name ) . '' );
$activity_content = $content;
$activity_id = groups_record_activity( array(
@@ -1922,7 +1922,7 @@
if ( $post_id = bp_forums_insert_post( array( 'post_text' => $post_text, 'topic_id' => $topic_id ) ) ) {
$topic = bp_forums_get_topic_details( $topic_id );
- $activity_action = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '' . attribute_escape( $topic->topic_title ) . '', '' . attribute_escape( $bp->groups->current_group->name ) . '' );
+ $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 ), '' . attribute_escape( $topic->topic_title ) . '', '' . attribute_escape( $bp->groups->current_group->name ) . '' );
$activity_content = bp_create_excerpt( $post_text );
$primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
@@ -1961,7 +1961,7 @@
if ( $topic_id = bp_forums_new_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_tags' => $topic_tags, 'forum_id' => $forum_id ) ) ) {
$topic = bp_forums_get_topic_details( $topic_id );
- $activity_action = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '' . attribute_escape( $topic->topic_title ) . '', '' . attribute_escape( $bp->groups->current_group->name ) . '' );
+ $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 ), '' . attribute_escape( $topic->topic_title ) . '', '' . attribute_escape( $bp->groups->current_group->name ) . '' );
$activity_content = bp_create_excerpt( $topic_text );
/* Record this in activity streams */
@@ -1993,7 +1993,7 @@
if ( function_exists( 'bp_activity_delete_by_item_id' ) )
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' ) );
- $activity_action = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '' . attribute_escape( $topic->topic_title ) . '', '' . attribute_escape( $bp->groups->current_group->name ) . '' );
+ $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '' . attribute_escape( $topic->topic_title ) . '', '' . attribute_escape( $bp->groups->current_group->name ) . '' );
$activity_content = bp_create_excerpt( $topic_text );
/* Record this in activity streams */
@@ -2027,7 +2027,7 @@
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 ) ) ) {
$topic = bp_forums_get_topic_details( $topic_id );
- $activity_action = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '' . attribute_escape( $topic->topic_title ) . '', '' . attribute_escape( $bp->groups->current_group->name ) . '' );
+ $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 ), '' . attribute_escape( $topic->topic_title ) . '', '' . attribute_escape( $bp->groups->current_group->name ) . '' );
$activity_content = bp_create_excerpt( $post_text );
$primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
@@ -2348,7 +2348,7 @@
$group = new BP_Groups_Group( $group_id );
groups_record_activity( array(
- 'action' => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '%s joined the group %s', 'buddypress'), bp_core_get_userlink( $user_id ), '' . attribute_escape( $group->name ) . '' ), $user_id, &$group ),
+ 'action' => apply_filters( 'groups_activity_membership_accepted_action', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '' . attribute_escape( $group->name ) . '' ), $user_id, &$group ),
'type' => 'joined_group',
'item_id' => $group->id,
'user_id' => $user_id
Index: bp-blogs/bp-blogs-templatetags.php
===================================================================
--- bp-blogs/bp-blogs-templatetags.php (revision 2904)
+++ bp-blogs/bp-blogs-templatetags.php (working copy)
@@ -166,7 +166,7 @@
$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 ) );
$total = bp_core_number_format( $blogs_template->total_blog_count );
- echo sprintf( __( 'Viewing blog %s to %s (of %s blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?>
+ echo sprintf( __( 'Viewing blog %1$d to %2$d (of %3$d blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?>
pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $from_num + ( $messages_template->pag_num - 1 ) );
$total = bp_core_number_format( $messages_template->total_thread_count );
- echo sprintf( __( 'Viewing message %s to %s (of %s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?>
+ echo sprintf( __( 'Viewing message %1$d to %2$d (of %3$d messages)', 'buddypress' ), $from_num, $to_num, $total ); ?>
type && !empty( $forum_template->search_terms ) )
$pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
- echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (%s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) );
+ 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 ) );
?>
pag_page - 1 ) * $topic_template->pag_num ) + 1;
$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 );
- 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 ) );
+ 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 ) );
?>
tags ) ) { ?>
- BuddyPress is ready. You'll need to activate a BuddyPress compatible theme to take advantage of all of the features. We've bundled a default theme, but you can always install some other compatible themes or upgrade your existing WordPress theme.", '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' ) ) ?>
+ BuddyPress is ready. You'll need to activate a BuddyPress compatible theme to take advantage of all of the features. We've bundled a default theme, but you can always install some other compatible themes or upgrade your existing WordPress theme.", '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' ) ) ?>
name, $group_link );
@@ -62,14 +62,14 @@
$subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
$message = sprintf( __(
-'%s wants to join the group "%s".
+'%1$s wants to join the group "%2$s".
Because you are the administrator of this group, you must either accept or reject the membership request.
To view all pending membership requests for this group, please visit:
-%s
+%3$s
-To view %s\'s profile: %s
+To view %4$s\'s profile: %5$s
---------------------
', 'buddypress' ), $requesting_user_name, $group->name, $group_requests, $requesting_user_name, $profile_link );
@@ -109,9 +109,9 @@
if ( $accepted ) {
$subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
$message = sprintf( __(
-'Your membership request for the group "%s" has been accepted.
+'Your membership request for the group "%1$s" has been accepted.
-To view the group please login and visit: %s
+To view the group please login and visit: %2$s
---------------------
', 'buddypress' ), $group->name, $group_link );
@@ -119,9 +119,9 @@
} else {
$subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
$message = sprintf( __(
-'Your membership request for the group "%s" has been rejected.
+'Your membership request for the group "%1$s" has been rejected.
-To submit another request please log in and visit: %s
+To submit another request please log in and visit: %2$s
---------------------
', 'buddypress' ), $group->name, $group_link );
@@ -166,9 +166,9 @@
$subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
$message = sprintf( __(
-'You have been promoted to %s for the group: "%s".
+'You have been promoted to %1$s for the group: "%2$s".
-To view the group please visit: %s
+To view the group please visit: %3$s
---------------------
', 'buddypress' ), $promoted_to, $group->name, $group_link );
@@ -214,13 +214,13 @@
$subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
$message = sprintf( __(
-'One of your friends %s has invited you to the group: "%s".
+'One of your friends %1$s has invited you to the group: "%2$s".
-To view your group invites visit: %s
+To view your group invites visit: %3$s
-To view the group visit: %s
+To view the group visit: %4$s
-To view %s\'s profile visit: %s
+To view %5$s\'s profile visit: %6$s
---------------------
', 'buddypress' ), $inviter_name, $group->name, $invites_link, $group_link, $inviter_name, $inviter_link );
@@ -270,14 +270,14 @@
// Set up and send the message
$ud = bp_core_get_core_userdata( $receiver_user_id );
$to = $ud->user_email;
- $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
+ $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name );
$message = sprintf( __(
-'%s mentioned you in the group "%s":
+'%1$s mentioned you in the group "%2$s":
-"%s"
+"%3$s"
-To view and respond to the message, log in and visit: %s
+To view and respond to the message, log in and visit: %4$s
---------------------
', 'buddypress' ), $poster_name, $group->name, $content, $message_link );
Index: bp-groups/bp-groups-templatetags.php
===================================================================
--- bp-groups/bp-groups-templatetags.php (revision 2904)
+++ bp-groups/bp-groups-templatetags.php (working copy)
@@ -555,7 +555,7 @@
$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 ) );
$total = bp_core_number_format( $groups_template->total_group_count );
- echo sprintf( __( 'Viewing group %s to %s (of %s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?>
+ echo sprintf( __( 'Viewing group %1$d to %2$d (of %3$d groups)', 'buddypress' ), $from_num, $to_num, $total ); ?>
pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 ) );
$total = bp_core_number_format( $members_template->total_member_count );
- return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total ) );
+ 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 ) );
}
function bp_group_member_admin_pagination() {
custom header image support and sidebar widgets.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?>
+custom header image support and sidebar widgets.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?>
BuddyPress is ready. You'll need to activate a BuddyPress compatible theme to take advantage of all of the features. We've bundled a default theme, but you can always install some other compatible themes or upgrade your existing WordPress theme.", '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' ) ) ?>
+BuddyPress is ready. You'll need to activate a BuddyPress compatible theme to take advantage of all of the features. We've bundled a default theme, but you can always install some other compatible themes or upgrade your existing WordPress theme.", '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' ) ) ?>