Changeset 9765 for trunk/src/bp-members/bp-members-template.php

Timestamp:

04/17/2015 01:27:06 PM (10 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:

• trunk/src/bp-members/bp-members-template.php (modified) (1 diff)

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

@@ -632 +632 @@
         $total     = bp_core_number_format( $members_template->total_member_count );
 
-        if ( 'active' == $members_template->type )
-            $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 );
-        elseif ( 'popular' == $members_template->type )
-            $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 );
-        elseif ( 'online' == $members_template->type )
-            $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 );
-        else
-            $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 );
+        if ( 'active' == $members_template->type ) {
+            if ( 1 == $members_template->total_member_count ) {
+                $pag = __( 'Viewing 1 active member', 'buddypress' );
+            } else {
+                $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 );
+            }
+        } elseif ( 'popular' == $members_template->type ) {
+            if ( 1 == $members_template->total_member_count ) {
+                $pag = __( 'Viewing 1 member with friends', 'buddypress' );
+            } else {
+                $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 );
+            }
+        } elseif ( 'online' == $members_template->type ) {
+            if ( 1 == $members_template->total_member_count ) {
+                $pag = __( 'Viewing 1 online member', 'buddypress' );
+            } else {
+                $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 );
+            }
+        } else {
+            if ( 1 == $members_template->total_member_count ) {
+                $pag = __( 'Viewing 1 member', 'buddypress' );
+            } else {
+                $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 );
+            }
+        }
 
         /**