Changeset 2199

Timestamp:

12/18/2009 10:36:02 AM (17 years ago)

Author:

apeatling

Message:

More number formatting changes.

Location:

trunk

Files:

• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-blogs/bp-blogs-templatetags.php (modified) (4 diffs)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)
• bp-messages/bp-messages-templatetags.php (modified) (1 diff)

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

@@ -173 +173 @@
         $from_num = number_format( intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1 );
         $to_num = number_format( ( $from_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1 ) );
-
-        echo sprintf( __( 'Viewing item %d to %d (of %d items)', 'buddypress' ), $from_num, $to_num, $activities_template->total_activity_count ); ?>  
+        $total = number_format( $activities_template->total_activity_count );
+
+        echo sprintf( __( 'Viewing item %s to %s (of %s items)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
         <span class="ajax-loader"></span><?php
 }

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -172 +172 @@
         $from_num = number_format( intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1 );
         $to_num = number_format( ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) );
-
-        echo sprintf( __( 'Viewing blog %d to %d (of %d blogs)', 'buddypress' ), $from_num, $to_num, $blogs_template->total_blog_count ); ?>  
+        $total = number_format( $blogs_template->total_blog_count );
+
+        echo sprintf( __( 'Viewing blog %s to %s (of %s blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
         <span class="ajax-loader"></span><?php
 }
@@ -284 +285 @@
                 return apply_filters( 'bp_get_total_blog_count', bp_blogs_total_blogs() );
         }
+        add_filter( 'bp_get_total_blog_count', 'number_format' );
 
 function bp_total_blog_count_for_user( $user_id = false ) {
@@ -291 +293 @@
                 return apply_filters( 'bp_get_total_blog_count_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
         }
+        add_filter( 'bp_get_total_blog_count_for_user', 'number_format' );
 
 /***
@@ -433 +436 @@
         global $bp, $posts_template;
 
-        $from_num = intval( ( $posts_template->pag_page - 1 ) * $posts_template->pag_num ) + 1;
-        $to_num = ( $from_num + ( $posts_template->pag_num - 1 ) > $posts_template->total_post_count ) ? $posts_template->total_post_count : $from_num + ( $posts_template->pag_num - 1 ) ;
-
-        echo sprintf( __( 'Viewing post %d to %d (of %d posts)', 'buddypress' ), $from_num, $to_num, $posts_template->total_post_count ); ?> &nbsp;
+        $from_num = number_format( intval( ( $posts_template->pag_page - 1 ) * $posts_template->pag_num ) + 1 );
+        $to_num = number_format( ( $from_num + ( $posts_template->pag_num - 1 ) > $posts_template->total_post_count ) ? $posts_template->total_post_count : $from_num + ( $posts_template->pag_num - 1 ) );
+
+        echo sprintf( __( 'Viewing post %s to %s (of %s posts)', 'buddypress' ), $from_num, $to_num, $posts_template->total_post_count ); ?> &nbsp;
         <span class="ajax-loader"></span><?php
 }

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

@@ -164 +164 @@
         $from_num = number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
         $to_num = number_format( ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1) );
+        $total = number_format( $members_template->total_member_count );
 
         if ( 'active' == $members_template->type )
-                echo sprintf( __( 'Viewing member %d to %d (of %d active members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
+                echo sprintf( __( 'Viewing member %s to %s (of %s active members)', 'buddypress' ), $from_num, $to_num, $total );
         else if ( 'popular' == $members_template->type )
-                echo sprintf( __( 'Viewing member %d to %d (of %d members with friends)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
+                echo sprintf( __( 'Viewing member %s to %s (of %s members with friends)', 'buddypress' ), $from_num, $to_num, $total );
         else if ( 'online' == $members_template->type )
-                echo sprintf( __( 'Viewing member %d to %d (of %d members online)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
+                echo sprintf( __( 'Viewing member %s to %s (of %s members online)', 'buddypress' ), $from_num, $to_num, $total );
         else
-                echo sprintf( __( 'Viewing member %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
+                echo sprintf( __( 'Viewing member %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total );
 
         ?><span class="ajax-loader"></span><?php

trunk/bp-forums/bp-forums-templatetags.php

@@ -644 +644 @@
         $from_num = number_format( intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1 );
         $to_num = number_format( ( $from_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 ) );
-
-        echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %d to %d (%d total topics)', 'buddypress' ), $from_num, $to_num, $forum_template->total_topic_count ) );
+        $total = number_format( $forum_template->total_topic_count );
+
+        echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (%s total topics)', 'buddypress' ), $from_num, $to_num, $total ) );
 ?>
 <span class="ajax-loader"></span>

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

@@ -678 +678 @@
         $from_num = number_format( intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1 );
         $to_num = number_format( ( $from_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $from_num + ( $groups_template->pag_num - 1 ) );
-
-        echo sprintf( __( 'Viewing group %d to %d (of %d groups)', 'buddypress' ), $from_num, $to_num, $groups_template->total_group_count ); ?>  
+        $total = number_format( $groups_template->total_group_count );
+
+        echo sprintf( __( 'Viewing group %s to %s (of %s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
         <span class="ajax-loader"></span><?php
 }
@@ -1450 +1451 @@
                 global $members_template;
 
-                $from_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
-                $to_num = ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 );
-
-                return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %d to %d (of %d members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count ) );
+                $from_num = number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
+                $to_num = number_format( ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 ) );
+                $total = number_format( $members_template->total_member_count );
+
+                return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total ) );
         }
 

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

@@ -276 +276 @@
         $from_num = number_format( intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1 );
         $to_num = number_format( ( $from_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $from_num + ( $messages_template->pag_num - 1 ) );
-
-        echo sprintf( __( 'Viewing message %d to %d (of %d messages)', 'buddypress' ), $from_num, $to_num, $messages_template->total_thread_count ); ?>  
+        $total = number_format( $messages_template->total_thread_count );
+
+        echo sprintf( __( 'Viewing message %s to %s (of %s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
         <span class="ajax-loader"></span><?php
 }