Changeset 7439

Timestamp:

10/17/2013 04:24:33 PM (11 years ago)

Author:

boonebgorges

Message:

Improved plural i18n for pagination links

Cases where there is only one page of results will now read, eg, "...of 1
member" instead of "...of 1 members".

Where the pagination links are put through apply_filters(), this changeset
also adds the passing of the $from_num, $to_num, and $total values to the
filter.

Fixes #5107

Props imath

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (1 diff)
• bp-blogs/bp-blogs-template.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (2 diffs)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-messages/bp-messages-template.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/members/single/groups/invites.php (modified) (1 diff)
• bp-themes/bp-default/members/single/groups/invites.php (modified) (1 diff)

trunk/bp-activity/bp-activity-template.php

@@ -692 +692 @@
         $total     = bp_core_number_format( $activities_template->total_activity_count );
 
-        return sprintf( __( 'Viewing item %1$s to %2$s (of %3$s items)', 'buddypress' ), $from_num, $to_num, $total );
+        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, number_format_i18n( $total ) );
     }
 

trunk/bp-blogs/bp-blogs-template.php

@@ -421 +421 @@
     $total     = bp_core_number_format( $blogs_template->total_blog_count );
 
-    echo sprintf( __( 'Viewing site %1$s to %2$s (of %3$s sites)', 'buddypress' ), $from_num, $to_num, $total );
+    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, number_format_i18n( $total ) );
 }
 

trunk/bp-forums/bp-forums-template.php

@@ -966 +966 @@
             $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
 
-        return apply_filters( 'bp_get_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (of %s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) );
+        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, number_format_i18n( $total ), $pag_filter ), $from_num, $to_num, $total );
     }
 
@@ -1306 +1306 @@
     $total = bp_core_number_format( $topic_template->total_post_count );
 
-    echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post %1$s to %2$s (%3$s total posts)', 'buddypress' ), $from_num, $to_num, $total ) );
+    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, number_format_i18n( $total ) ), $from_num, $to_num, $total );
 }
 

trunk/bp-groups/bp-groups-template.php

@@ -930 +930 @@
         $total     = bp_core_number_format( $groups_template->total_group_count );
 
-        return apply_filters( 'bp_get_groups_pagination_count', sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ) );
+        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, number_format_i18n( $total ) ), $from_num, $to_num, $total );
     }
 
@@ -2151 +2151 @@
         $total = bp_core_number_format( $members_template->total_member_count );
 
-        return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total ) );
+        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, number_format_i18n( $total ) ), $from_num, $to_num, $total );
     }
 

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

@@ -345 +345 @@
 
         if ( 'active' == $members_template->type )
-            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s active members)', 'buddypress' ), $from_num, $to_num, $total );
+            $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)', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) );
         else if ( 'popular' == $members_template->type )
-            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members with friends)', 'buddypress' ), $from_num, $to_num, $total );
+            $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)', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) );
         else if ( 'online' == $members_template->type )
-            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members online)', 'buddypress' ), $from_num, $to_num, $total );
+            $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)', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) );
         else
-            $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total );
+            $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)', $total, 'buddypress' ), $from_num, $to_num, number_format_i18n( $total ) );
 
         return apply_filters( 'bp_members_pagination_count', $pag );

trunk/bp-messages/bp-messages-template.php

@@ -397 +397 @@
     $total = bp_core_number_format( $messages_template->total_thread_count );
 
-    echo sprintf( __( 'Viewing message %1$s to %2$s (of %3$s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?><?php
+    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
 }
 

trunk/bp-templates/bp-legacy/buddypress/members/single/groups/invites.php

@@ -12 +12 @@
                 </div>
 
-                <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( __( '%s members', 'buddypress' ), bp_group_total_members( false ) ); ?></span></h4>
+                <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( _n( '1 member', '%d members', bp_get_group_total_members( false ), 'buddypress' )  ); ?></span></h4>
 
                 <p class="desc">

trunk/bp-themes/bp-default/members/single/groups/invites.php

@@ -12 +12 @@
                 </div>
 
-                <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( __( '%s members', 'buddypress' ), bp_group_total_members( false ) ); ?></span></h4>
+                <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( _n( '1 member', '%d members', bp_get_group_total_members( false ), 'buddypress' )  ); ?></span></h4>
 
                 <p class="desc">