Skip to:
Content

BuddyPress.org

Ticket #5767: 5767.patch

File 5767.patch, 10.8 KB (added by danbp, 10 years ago)

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

     
    768768                $to_num    = bp_core_number_format( ( $start_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $start_num + ( $activities_template->pag_num - 1 ) );
    769769                $total     = bp_core_number_format( $activities_template->total_activity_count );
    770770
    771                 return sprintf( _n( 'Viewing item %1$s to %2$s (of %3$s item)', 'Viewing item %1$s to %2$s (of %3$s items)', $total, 'buddypress' ), $from_num, $to_num, $total );
     771                return sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing activity items', $total, 'buddypress' ), $from_num, $to_num, $total );
    772772        }
    773773
    774774/**

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

     
    434434        $to_num    = bp_core_number_format( ( $start_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $start_num + ( $blogs_template->pag_num - 1 ) );
    435435        $total     = bp_core_number_format( $blogs_template->total_blog_count );
    436436
    437         echo sprintf( _n( 'Viewing site %1$s to %2$s (of %3$s site)', 'Viewing site %1$s to %2$s (of %3$s sites)', $total, 'buddypress' ), $from_num, $to_num, $total );
     437        echo sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing sites', $total, 'buddypress' ), $from_num, $to_num, $total );
    438438}
    439439
    440440/**

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

     
    15241524                if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) )
    15251525                        $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
    15261526
    1527                 return apply_filters( 'bp_get_forum_pagination_count', sprintf( _n( 'Viewing topic %s to %s (of %d topic%s)', 'Viewing topic %s to %s (of %d total topics%s)', $total, 'buddypress' ), $from_num, $to_num, $total, $pag_filter ), $from_num, $to_num, $total );
     1527                return apply_filters( 'bp_get_forum_pagination_count', sprintf( _x( '%s - %s of %d%s', 'Viewing forum topics', $total, 'buddypress' ), $from_num, $to_num, $total, $pag_filter ), $from_num, $to_num, $total );
    15281528        }
    15291529
    15301530/**
    … …  
    21632163        $to_num = bp_core_number_format( ( $start_num + ( $topic_template->pag_num - 1  ) > $topic_template->total_post_count ) ? $topic_template->total_post_count : $start_num + ( $topic_template->pag_num - 1 ) );
    21642164        $total = bp_core_number_format( $topic_template->total_post_count );
    21652165
    2166         echo apply_filters( 'bp_the_topic_pagination_count', sprintf( _n( 'Viewing post %1$s to %2$s (%3$s post)', 'Viewing post %1$s to %2$s (%3$s total posts)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     2166        echo apply_filters( 'bp_the_topic_pagination_count', sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing forum posts)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
    21672167}
    21682168
    21692169/**

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

     
    10191019                $to_num    = bp_core_number_format( ( $start_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $start_num + ( $groups_template->pag_num - 1 ) );
    10201020                $total     = bp_core_number_format( $groups_template->total_group_count );
    10211021
    1022                 return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing group %1$s to %2$s (of %3$s group)', 'Viewing group %1$s to %2$s (of %3$s groups)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     1022                return apply_filters( 'bp_get_groups_pagination_count', sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing group', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
    10231023        }
    10241024
    10251025function bp_groups_auto_join() {
    … …  
    24512451                $to_num = bp_core_number_format( ( $start_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $start_num + ( $members_template->pag_num - 1 ) );
    24522452                $total = bp_core_number_format( $members_template->total_member_count );
    24532453
    2454                 return apply_filters( 'bp_get_group_member_pagination_count', sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s member)', 'Viewing members %1$s to %2$s (of %3$s members)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     2454                return apply_filters( 'bp_get_group_member_pagination_count', sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing group members', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
    24552455        }
    24562456
    24572457function bp_group_member_admin_pagination() {
    … …  
    33293329                $to_num    = bp_core_number_format( ( $start_num + ( $requests_template->pag_num - 1 ) > $requests_template->total_request_count ) ? $requests_template->total_request_count : $start_num + ( $requests_template->pag_num - 1 ) );
    33303330                $total     = bp_core_number_format( $requests_template->total_request_count );
    33313331
    3332                 return apply_filters( 'bp_get_group_requests_pagination_count', sprintf( _n( 'Viewing requests %1$s to %2$s (of %3$s request)', 'Viewing request %1$s to %2$s (of %3$s requests)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     3332                return apply_filters( 'bp_get_group_requests_pagination_count', sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing group request', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
    33333333        }
    33343334
    33353335/************************************************************************************
    … …  
    36243624                $to_num    = bp_core_number_format( ( $start_num + ( $invites_template->pag_num - 1 ) > $invites_template->total_invite_count ) ? $invites_template->total_invite_count : $start_num + ( $invites_template->pag_num - 1 ) );
    36253625                $total     = bp_core_number_format( $invites_template->total_invite_count );
    36263626
    3627                 return apply_filters( 'bp_get_groups_pagination_count', sprintf( _n( 'Viewing invitation %1$s to %2$s (of %3$s invitation)', 'Viewing invitation %1$s to %2$s (of %3$s invitations)', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
     3627                return apply_filters( 'bp_get_groups_pagination_count', sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing group invitation', $total, 'buddypress' ), $from_num, $to_num, $total ), $from_num, $to_num, $total );
    36283628        }
    36293629
    36303630/***

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

     
    513513                $total     = bp_core_number_format( $members_template->total_member_count );
    514514
    515515                if ( 'active' == $members_template->type )
    516                         $pag = sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s active member)', 'Viewing member %1$s to %2$s (of %3$s active members)', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     516                        $pag = sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing active members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
    517517                else if ( 'popular' == $members_template->type )
    518                         $pag = sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s member with friends)', 'Viewing member %1$s to %2$s (of %3$s members with friends)', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     518                        $pag = sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing members with friends', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
    519519                else if ( 'online' == $members_template->type )
    520                         $pag = sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s member online)', 'Viewing member %1$s to %2$s (of %3$s members online)', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     520                        $pag = sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing members online', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
    521521                else
    522                         $pag = sprintf( _n( 'Viewing member %1$s to %2$s (of %3$s member)', 'Viewing member %1$s to %2$s (of %3$s members)', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     522                        $pag = sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
    523523
    524524                return apply_filters( 'bp_members_pagination_count', $pag );
    525525        }

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

     
    717717        $to_num = bp_core_number_format( ( $start_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $start_num + ( $messages_template->pag_num - 1 ) );
    718718        $total = bp_core_number_format( $messages_template->total_thread_count );
    719719
    720         echo sprintf( _n( 'Viewing message %1$s to %2$s (of %3$s message)', 'Viewing message %1$s to %2$s (of %3$s messages)', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) ); ?><?php
     720        echo sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing message', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) ); ?><?php
    721721}
    722722
    723723/**

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

     
    10001000                $from_num   = bp_core_number_format( $start_num );
    10011001                $to_num     = bp_core_number_format( ( $start_num + ( $query_loop->pag_num - 1 ) > $query_loop->total_notification_count ) ? $query_loop->total_notification_count : $start_num + ( $query_loop->pag_num - 1 ) );
    10021002                $total      = bp_core_number_format( $query_loop->total_notification_count );
    1003                 $pag        = sprintf( _n( 'Viewing %1$s to %2$s (of %3$s notification)', 'Viewing %1$s to %2$s (of %3$s notifications)', $total, 'buddypress' ), $from_num, $to_num, $total );
     1003                $pag        = sprintf( _x( '%1$s - %2$s of %3$s', 'Viewing notifications', $total, 'buddypress' ), $from_num, $to_num, $total );
    10041004
    10051005                return apply_filters( 'bp_notifications_pagination_count', $pag );
    10061006        }