Changeset 7520

Timestamp:

11/07/2013 03:10:11 PM (12 years ago)

Author:

boonebgorges

Message:

Improvements to i18n number formatting in activity count functions/templates

This changeset makes number formatting more consistent in the activity
templates of bp-legacy. The logic is as follows:

• Move all number formatting out of the templates and into the relevant -template.php file.
• Add number formatting to those _count() template functions that were missing it.
• Clean up sprintf() swapping arguments to account for string vs int number formats

See #4997, #5228

Fixes #5231

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-core/bp-core-template.php (modified) (1 diff)
• bp-groups/bp-groups-loader.php (modified) (1 diff)
• bp-groups/bp-groups-template.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/activity/index.php (modified) (5 diffs)

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

@@ -2653 +2653 @@
         return apply_filters( 'bp_get_total_favorite_count_for_user', bp_activity_total_favorites_for_user( $user_id ) );
     }
+    add_filter( 'bp_get_total_favorite_count_for_user', 'bp_core_number_format' );
 
 /**
@@ -2686 +2687 @@
         return apply_filters( 'bp_get_total_mention_count_for_user', bp_get_user_meta( $user_id, 'bp_new_mention_count', true ) );
     }
+    add_filter( 'bp_get_total_mention_count_for_user', 'bp_core_number_format' );
 
 /**

trunk/bp-core/bp-core-template.php

@@ -648 +648 @@
         return apply_filters( 'bp_get_total_member_count', bp_core_get_active_member_count() );
     }
+    add_filter( 'bp_get_total_member_count', 'bp_core_number_format' );
 
 /**

trunk/bp-groups/bp-groups-loader.php

@@ -343 +343 @@
         // Add 'Groups' to the main navigation
         $main_nav = array(
-            'name'                => sprintf( __( 'Groups <span>%d</span>', 'buddypress' ), bp_get_total_group_count_for_user() ),
+            'name'                => sprintf( __( 'Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user() ),
             'slug'                => $this->slug,
             'position'            => 70,

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

@@ -1897 +1897 @@
         return apply_filters( 'bp_get_total_group_count_for_user', groups_total_groups_for_user( $user_id ), $user_id );
     }
+    add_filter( 'bp_get_total_group_count_for_user', 'bp_core_number_format' );
 
 

trunk/bp-templates/bp-legacy/buddypress/activity/index.php

@@ -17 +17 @@
             <?php do_action( 'bp_before_activity_type_tab_all' ); ?>
 
-            <li class="selected" id="activity-all"><a href="<?php bp_activity_directory_permalink(); ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), number_format_i18n( bp_get_total_member_count() ) ); ?></a></li>
+            <li class="selected" id="activity-all"><a href="<?php bp_activity_directory_permalink(); ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
 
             <?php if ( is_user_logged_in() ) : ?>
@@ -27 +27 @@
                     <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
-                        <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/'; ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ); ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), number_format_i18n( bp_get_total_friend_count( bp_loggedin_user_id() ) ) ); ?></a></li>
+                        <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/'; ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ); ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>
 
                     <?php endif; ?>
@@ -39 +39 @@
                     <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                        <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/'; ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ); ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), number_format_i18n( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ); ?></a></li>
+                        <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/'; ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ); ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
 
                     <?php endif; ?>
@@ -49 +49 @@
                 <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-                    <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/'; ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ); ?>"><?php printf( __( 'My Favorites <span>%s</span>', 'buddypress' ), number_format_i18n( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ); ?></a></li>
+                    <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/'; ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ); ?>"><?php printf( __( 'My Favorites <span>%s</span>', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
 
                 <?php endif; ?>
@@ -57 +57 @@
                     <?php do_action( 'bp_before_activity_type_tab_mentions' ); ?>
 
-                    <li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/'; ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ); ?>"><?php _e( 'Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><span><?php printf( _nx( '%s new', '%s new', bp_get_total_mention_count_for_user( bp_loggedin_user_id() ), 'Number of new activity mentions', 'buddypress' ), number_format_i18n( bp_get_total_mention_count_for_user( bp_loggedin_user_id()  )) ); ?></span></strong><?php endif; ?></a></li>
+                    <li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/'; ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ); ?>"><?php _e( 'Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><span><?php printf( _nx( '%s new', '%s new', bp_get_total_mention_count_for_user( bp_loggedin_user_id() ), 'Number of new activity mentions', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ); ?></span></strong><?php endif; ?></a></li>
 
                 <?php endif; ?>