Skip to:
Content

BuddyPress.org

Changeset 2941


Ignore:
Timestamp:
04/19/2010 06:13:58 PM (15 years ago)
Author:
johnjamesjacoby
Message:

Fixes #2291 props DJPaul

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r2925 r2941  
    3232
    3333$message = sprintf( __(
    34 '%s mentioned you in an update:
     34'%1$s mentioned you in an update:
    3535
    36 "%s"
     36"%2$s"
    3737
    38 To view and respond to the message, log in and visit: %s
     38To view and respond to the message, log in and visit: %3$s
    3939
    4040---------------------
    … …  
    7575
    7676$message = sprintf( __(
    77 '%s replied to one of your updates:
     77'%1$s replied to one of your updates:
    7878
    79 "%s"
     79"%2$s"
    8080
    81 To view your original update and all comments, log in and visit: %s
     81To view your original update and all comments, log in and visit: %3$s
    8282
    8383---------------------
    … …  
    117117
    118118$message = sprintf( __(
    119 '%s replied to one of your comments:
     119'%1$s replied to one of your comments:
    120120
    121 "%s"
     121"%2$s"
    122122
    123 To view the original activity, your comment and all replies, log in and visit: %s
     123To view the original activity, your comment and all replies, log in and visit: %3$s
    124124
    125125---------------------

  • trunk/bp-activity/bp-activity-templatetags.php

    r2919 r2941  
    275275        $total = bp_core_number_format( $activities_template->total_activity_count );
    276276
    277         return sprintf( __( 'Viewing item %s to %s (of %s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' &nbsp; <span class="ajax-loader"></span>';
     277        return sprintf( __( 'Viewing item %1$d to %2$d (of %3$d items)', 'buddypress' ), $from_num, $to_num, $total ) . ' &nbsp; <span class="ajax-loader"></span>';
    278278    }
    279279

  • trunk/bp-blogs.php

    r2925 r2941  
    288288        bp_blogs_record_activity( array(
    289289            'user_id' => $recorded_blog->user_id,
    290             '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 ),
     290            '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 ),
    291291            'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_blog_option( $recorded_blog->blog_id, 'siteurl' ), $recorded_blog->blog_id ),
    292292            'type' => 'new_blog',
    … …  
    323323            $post_permalink = get_permalink( $post_id );
    324324
    325             $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>' );
     325            $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>' );
    326326            $activity_content = $post->post_content;
    327327
    … …  
    370370        /* Record in activity streams */
    371371        $comment_link = get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment_id;
    372         $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>' );
     372        $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>' );
    373373        $activity_content = $comment->comment_content;
    374374

  • trunk/bp-core.php

    r2925 r2941  
    19151915        if ( !defined( 'BP_SILENCE_THEME_NOTICE' ) && !in_array( 'buddypress', (array)$ct->tags ) ) { ?>
    19161916            <div id="message" class="updated fade">
    1917                 <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>
     1917                <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='%1$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>
    19181918            </div><?php
    19191919        }

  • trunk/bp-core/bp-core-filters.php

    r2913 r2941  
    184184    $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
    185185    $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
    186     $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}" ) );
     186    $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}" ) );
    187187    $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), clean_url('http://' . $domain . $path));
    188188

  • trunk/bp-core/bp-core-templatetags.php

    r2925 r2941  
    181181
    182182    if ( 'active' == $members_template->type )
    183         echo sprintf( __( 'Viewing member %s to %s (of %s active members)', 'buddypress' ), $from_num, $to_num, $total );
     183        echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d active members)', 'buddypress' ), $from_num, $to_num, $total );
    184184    else if ( 'popular' == $members_template->type )
    185         echo sprintf( __( 'Viewing member %s to %s (of %s members with friends)', 'buddypress' ), $from_num, $to_num, $total );
     185        echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members with friends)', 'buddypress' ), $from_num, $to_num, $total );
    186186    else if ( 'online' == $members_template->type )
    187         echo sprintf( __( 'Viewing member %s to %s (of %s members online)', 'buddypress' ), $from_num, $to_num, $total );
     187        echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members online)', 'buddypress' ), $from_num, $to_num, $total );
    188188    else
    189         echo sprintf( __( 'Viewing member %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total );
     189        echo sprintf( __( 'Viewing member %1$d to %2$d (of %3$d members)', 'buddypress' ), $from_num, $to_num, $total );
    190190
    191191    ?><span class="ajax-loader"></span><?php

  • trunk/bp-friends.php

    r2925 r2941  
    385385            'user_id' => $friendship->initiator_user_id,
    386386            'type' => 'friendship_created',
    387             'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
     387            'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
    388388            'item_id' => $friendship_id
    389389        ) );
    … …  
    393393            'user_id' => $friendship->friend_user_id,
    394394            'type' => 'friendship_created',
    395             'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
     395            'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
    396396            'item_id' => $friendship_id,
    397397            'hide_sitewide' => true /* We've already got the first entry site wide */

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

    r2719 r2941  
    2222
    2323    $message = sprintf( __(
    24 "%s wants to add you as a friend.
     24"%1$s wants to add you as a friend.
    2525
    26 To view all of your pending friendship requests: %s
     26To view all of your pending friendship requests: %2$s
    2727
    28 To view %s's profile: %s
     28To view %3$s's profile: %4$s
    2929
    3030---------------------
    … …  
    6161
    6262    $message = sprintf( __(
    63 '%s accepted your friend request.
     63'%1$s accepted your friend request.
    6464
    65 To view %s\'s profile: %s
     65To view %2$s\'s profile: %3$s
    6666
    6767---------------------

  • trunk/bp-groups.php

    r2925 r2941  
    226226
    227227            groups_record_activity( array(
    228                 '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 ),
     228                '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 ),
    229229                'type' => 'joined_group',
    230230                'item_id' => $group->id
    … …  
    10481048            /* Once we compelete all steps, record the group creation in the activity stream. */
    10491049            groups_record_activity( array(
    1050                 '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>' ) ),
     1050                '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>' ) ),
    10511051                'type' => 'created_group',
    10521052                'item_id' => $bp->groups->new_group_id
    … …  
    12571257
    12581258            if ( (int)$total_items > 1 ) {
    1259                 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 );
     1259                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 );
    12601260            } else {
    12611261                $user_fullname = bp_core_get_user_displayname( $requesting_user_id );
    1262                 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 );
     1262                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 "%2$s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
    12631263            }
    12641264        break;
    … …  
    16211621    /* Record this in activity streams */
    16221622    groups_record_activity( array(
    1623         '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>' ) ),
     1623        '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>' ) ),
    16241624        'type' => 'joined_group',
    16251625        'item_id' => $group_id
    … …  
    17761776
    17771777    /* Record this in activity streams */
    1778     $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>' );
     1778    $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>' );
    17791779    $activity_content = $content;
    17801780
    … …  
    18291829        $topic = bp_forums_get_topic_details( $topic_id );
    18301830
    1831         $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>' );
     1831        $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>' );
    18321832        $activity_content = bp_create_excerpt( $post_text );
    18331833        $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
    … …  
    18681868        $topic = bp_forums_get_topic_details( $topic_id );
    18691869
    1870         $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>' );
     1870        $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>' );
    18711871        $activity_content = bp_create_excerpt( $topic_text );
    18721872
    … …  
    19001900            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' ) );
    19011901
    1902         $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>' );
     1902        $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>' );
    19031903        $activity_content = bp_create_excerpt( $topic_text );
    19041904
    … …  
    19341934        $topic = bp_forums_get_topic_details( $topic_id );
    19351935
    1936         $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>' );
     1936        $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>' );
    19371937        $activity_content = bp_create_excerpt( $post_text );
    19381938        $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
    … …  
    22552255
    22562256    groups_record_activity( array(
    2257         '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 ),
     2257        '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 ),
    22582258        'type' => 'joined_group',
    22592259        'item_id' => $group->id,

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

    r2719 r2941  
    2020
    2121        $message = sprintf( __(
    22 'Group details for the group "%s" were updated:
    23 
    24 To view the group: %s
     22'Group details for the group "%1$s" were updated:
     23
     24To view the group: %2$s
    2525
    2626---------------------
    … …  
    6363
    6464$message = sprintf( __(
    65 '%s wants to join the group "%s".
     65'%1$s wants to join the group "%2$s".
    6666
    6767Because you are the administrator of this group, you must either accept or reject the membership request.
    6868
    6969To view all pending membership requests for this group, please visit:
    70 %s
    71 
    72 To view %s\'s profile: %s
     70%3$s
     71
     72To view %4$s\'s profile: %5$s
    7373
    7474---------------------
    … …  
    110110        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
    111111        $message = sprintf( __(
    112 'Your membership request for the group "%s" has been accepted.
    113 
    114 To view the group please login and visit: %s
     112'Your membership request for the group "%1$s" has been accepted.
     113
     114To view the group please login and visit: %2$s
    115115
    116116---------------------
    … …  
    120120        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
    121121        $message = sprintf( __(
    122 'Your membership request for the group "%s" has been rejected.
    123 
    124 To submit another request please log in and visit: %s
     122'Your membership request for the group "%1$s" has been rejected.
     123
     124To submit another request please log in and visit: %2$s
    125125
    126126---------------------
    … …  
    167167
    168168    $message = sprintf( __(
    169 'You have been promoted to %s for the group: "%s".
    170 
    171 To view the group please visit: %s
     169'You have been promoted to %1$s for the group: "%2$s".
     170
     171To view the group please visit: %3$s
    172172
    173173---------------------
    … …  
    215215
    216216        $message = sprintf( __(
    217 'One of your friends %s has invited you to the group: "%s".
    218 
    219 To view your group invites visit: %s
    220 
    221 To view the group visit: %s
    222 
    223 To view %s\'s profile visit: %s
     217'One of your friends %1$s has invited you to the group: "%2$s".
     218
     219To view your group invites visit: %3$s
     220
     221To view the group visit: %4$s
     222
     223To view %5$s\'s profile visit: %6$s
    224224
    225225---------------------
    … …  
    271271            $ud = bp_core_get_core_userdata( $receiver_user_id );
    272272            $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 );
    274274
    275275$message = sprintf( __(
    276 '%s mentioned you in the group "%s":
    277 
    278 "%s"
    279 
    280 To view and respond to the message, log in and visit: %s
     276'%1$s mentioned you in the group "%2$s":
     277
     278"%3$s"
     279
     280To view and respond to the message, log in and visit: %4$s
    281281
    282282---------------------

  • trunk/bp-groups/bp-groups-templatetags.php

    r2919 r2941  
    557557    $total = bp_core_number_format( $groups_template->total_group_count );
    558558
    559     echo sprintf( __( 'Viewing group %s to %s (of %s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
     559    echo sprintf( __( 'Viewing group %1$d to %2$d (of %3$d groups)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
    560560    <span class="ajax-loader"></span><?php
    561561}
    … …  
    14141414        $total = bp_core_number_format( $members_template->total_member_count );
    14151415
    1416         return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total ) );
     1416        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 ) );
    14171417    }
    14181418

  • trunk/bp-messages.php

    r2863 r2941  
    299299    if ( 'new_message' == $action ) {
    300300        if ( (int)$total_items > 1 )
    301             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 );
     301            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 );
    302302        else
    303             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 );
     303            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 );
    304304    }
    305305

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

    r2925 r2941  
    2323
    2424        $email_content = sprintf( __(
    25 '%s sent you a new message:
     25'%1$s sent you a new message:
    2626
    27 Subject: %s
     27Subject: %2$s
    2828
    29 "%s"
     29"%3$s"
    3030
    31 To view and read your messages please log in and visit: %s
     31To view and read your messages please log in and visit: %4$s
    3232
    3333---------------------

  • trunk/bp-messages/bp-messages-templatetags.php

    r2822 r2941  
    313313    $total = bp_core_number_format( $messages_template->total_thread_count );
    314314
    315     echo sprintf( __( 'Viewing message %s to %s (of %s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
     315    echo sprintf( __( 'Viewing message %1$d to %2$d (of %3$d messages)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
    316316    <span class="ajax-loader"></span><?php
    317317}
Note: See TracChangeset for help on using the changeset viewer.