<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][7520] trunk: Improvements to i18n number formatting in activity count functions/templates</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7520">7520</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-11-07 15:10:11 +0000 (Thu, 07 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://buddypress.trac.wordpress.org/ticket/4997">#4997</a>, <a href="http://buddypress.trac.wordpress.org/ticket/5228">#5228</a>
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5231">#5231</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressactivityindexphp">trunk/bp-templates/bp-legacy/buddypress/activity/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (7519 => 7520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2013-11-05 19:33:14 UTC (rev 7519)
+++ trunk/bp-activity/bp-activity-template.php 2013-11-07 15:10:11 UTC (rev 7520)
</span><span class="lines">@@ -2652,6 +2652,7 @@
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_total_favorite_count_for_user', bp_activity_total_favorites_for_user( $user_id ) );
</span><span class="cx"> }
</span><ins>+ add_filter( 'bp_get_total_favorite_count_for_user', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Output the total mention count for a specified user.
</span><span class="lines">@@ -2685,6 +2686,7 @@
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_total_mention_count_for_user', bp_get_user_meta( $user_id, 'bp_new_mention_count', true ) );
</span><span class="cx"> }
</span><ins>+ add_filter( 'bp_get_total_mention_count_for_user', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Output the public message link for displayed user.
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (7519 => 7520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2013-11-05 19:33:14 UTC (rev 7519)
+++ trunk/bp-core/bp-core-template.php 2013-11-07 15:10:11 UTC (rev 7520)
</span><span class="lines">@@ -647,6 +647,7 @@
</span><span class="cx"> function bp_get_total_member_count() {
</span><span class="cx"> return apply_filters( 'bp_get_total_member_count', bp_core_get_active_member_count() );
</span><span class="cx"> }
</span><ins>+ add_filter( 'bp_get_total_member_count', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Output whether blog signup is allowed.
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (7519 => 7520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2013-11-05 19:33:14 UTC (rev 7519)
+++ trunk/bp-groups/bp-groups-loader.php 2013-11-07 15:10:11 UTC (rev 7520)
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> // Add 'Groups' to the main navigation
</span><span class="cx"> $main_nav = array(
</span><del>- 'name' => sprintf( __( 'Groups <span>%d</span>', 'buddypress' ), bp_get_total_group_count_for_user() ),
</del><ins>+ 'name' => sprintf( __( 'Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user() ),
</ins><span class="cx"> 'slug' => $this->slug,
</span><span class="cx"> 'position' => 70,
</span><span class="cx"> 'screen_function' => 'groups_screen_my_groups',
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (7519 => 7520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2013-11-05 19:33:14 UTC (rev 7519)
+++ trunk/bp-groups/bp-groups-template.php 2013-11-07 15:10:11 UTC (rev 7520)
</span><span class="lines">@@ -1896,6 +1896,7 @@
</span><span class="cx"> function bp_get_total_group_count_for_user( $user_id = 0 ) {
</span><span class="cx"> return apply_filters( 'bp_get_total_group_count_for_user', groups_total_groups_for_user( $user_id ), $user_id );
</span><span class="cx"> }
</span><ins>+ add_filter( 'bp_get_total_group_count_for_user', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /***************************************************************************
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressactivityindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/activity/index.php (7519 => 7520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/activity/index.php 2013-11-05 19:33:14 UTC (rev 7519)
+++ trunk/bp-templates/bp-legacy/buddypress/activity/index.php 2013-11-07 15:10:11 UTC (rev 7520)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> <ul>
</span><span class="cx"> <?php do_action( 'bp_before_activity_type_tab_all' ); ?>
</span><span class="cx">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><span class="cx">
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_activity_type_tab_mentions' ); ?>
</span><span class="cx">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>