Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
04/17/2015 01:27:06 PM (12 years ago)
Author:
boonebgorges
Message:

Improved plural forms for localizable strings.

Strings that are intended for use only in the case of a single item should not
be bundled with strings intended for use with plurals, as this pattern does not
work with languages that use the singular nominal form for numbers other than
one. See ​https://core.trac.wordpress.org/ticket/28502#comment:23.

This changeset also fixes a few places where a formatted string, rather than a
raw integer, was being passed as the $count value to _n().

Props SergeyBiryukov.
Fixes #6368.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-members/bp-members-template.php

    r9723 r9765  
    632632                $total     = bp_core_number_format( $members_template->total_member_count );
    633633
    634                 if ( 'active' == $members_template->type )
    635                         $pag = sprintf( _n( 'Viewing 1 active member', 'Viewing %1$s - %2$s of %3$s active members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
    636                 elseif ( 'popular' == $members_template->type )
    637                         $pag = sprintf( _n( 'Viewing 1 member with friends', 'Viewing %1$s - %2$s of %3$s members with friends', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
    638                 elseif ( 'online' == $members_template->type )
    639                         $pag = sprintf( _n( 'Viewing 1 online member', 'Viewing %1$s - %2$s of %3$s online members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
    640                 else
    641                         $pag = sprintf( _n( 'Viewing 1 member', 'Viewing %1$s - %2$s of %3$s members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     634                if ( 'active' == $members_template->type ) {
     635                        if ( 1 == $members_template->total_member_count ) {
     636                                $pag = __( 'Viewing 1 active member', 'buddypress' );
     637                        } else {
     638                                $pag = sprintf( _n( 'Viewing %1$s - %2$s of %3$s active member', 'Viewing %1$s - %2$s of %3$s active members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     639                        }
     640                } elseif ( 'popular' == $members_template->type ) {
     641                        if ( 1 == $members_template->total_member_count ) {
     642                                $pag = __( 'Viewing 1 member with friends', 'buddypress' );
     643                        } else {
     644                                $pag = sprintf( _n( 'Viewing %1$s - %2$s of %3$s member with friends', 'Viewing %1$s - %2$s of %3$s members with friends', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     645                        }
     646                } elseif ( 'online' == $members_template->type ) {
     647                        if ( 1 == $members_template->total_member_count ) {
     648                                $pag = __( 'Viewing 1 online member', 'buddypress' );
     649                        } else {
     650                                $pag = sprintf( _n( 'Viewing %1$s - %2$s of %3$s online member', 'Viewing %1$s - %2$s of %3$s online members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     651                        }
     652                } else {
     653                        if ( 1 == $members_template->total_member_count ) {
     654                                $pag = __( 'Viewing 1 member', 'buddypress' );
     655                        } else {
     656                                $pag = sprintf( _n( 'Viewing %1$s - %2$s of %3$s member', 'Viewing %1$s - %2$s of %3$s members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
     657                        }
     658                }
    642659
    643660                /**
Note: See TracChangeset for help on using the changeset viewer.