<!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][7102] trunk: Use _n() for plurals in bp_core_time_since()</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/7102">7102</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-24 13:33:06 +0000 (Fri, 24 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use _n() for plurals in bp_core_time_since()
The previous implementation used a hardcoded distinction between singular and
plurals, which is not flexible enough for many languages.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5015">#5015</a>
Props SergeyBiryukov</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkteststestcasescorefunctionsphp">trunk/tests/testcases/core/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (7101 => 7102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2013-05-24 13:26:41 UTC (rev 7101)
+++ trunk/bp-core/bp-core-functions.php 2013-05-24 13:33:06 UTC (rev 7102)
</span><span class="lines">@@ -591,13 +591,13 @@
</span><span class="cx">
</span><span class="cx"> // array of time period chunks
</span><span class="cx"> $chunks = array(
</span><del>- array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
- array( 60 * 60 * 24 * 30 , __( 'month', 'buddypress' ), __( 'months', 'buddypress' ) ),
- array( 60 * 60 * 24 * 7, __( 'week', 'buddypress' ), __( 'weeks', 'buddypress' ) ),
- array( 60 * 60 * 24 , __( 'day', 'buddypress' ), __( 'days', 'buddypress' ) ),
- array( 60 * 60 , __( 'hour', 'buddypress' ), __( 'hours', 'buddypress' ) ),
- array( 60 , __( 'minute', 'buddypress' ), __( 'minutes', 'buddypress' ) ),
- array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
</del><ins>+ YEAR_IN_SECONDS,
+ 30 * DAY_IN_SECONDS,
+ WEEK_IN_SECONDS,
+ DAY_IN_SECONDS,
+ HOUR_IN_SECONDS,
+ MINUTE_IN_SECONDS,
+ 1
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $older_date ) && !is_numeric( $older_date ) ) {
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">
</span><span class="cx"> // Step one: the first chunk
</span><span class="cx"> for ( $i = 0, $j = count( $chunks ); $i < $j; ++$i ) {
</span><del>- $seconds = $chunks[$i][0];
</del><ins>+ $seconds = $chunks[$i];
</ins><span class="cx">
</span><span class="cx"> // Finding the biggest chunk (if the chunk fits, break)
</span><span class="cx"> $count = floor( $since / $seconds );
</span><span class="lines">@@ -646,17 +646,57 @@
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> // Set output var
</span><del>- $output = ( 1 == $count ) ? '1 '. $chunks[$i][1] : $count . ' ' . $chunks[$i][2];
</del><ins>+ switch ( $seconds ) {
+ case YEAR_IN_SECONDS :
+ $output = sprintf( _n( '%s year', '%s years', $count, 'buddypress' ), $count );
+ break;
+ case 30 * DAY_IN_SECONDS :
+ $output = sprintf( _n( '%s month', '%s months', $count, 'buddypress' ), $count );
+ break;
+ case WEEK_IN_SECONDS :
+ $output = sprintf( _n( '%s week', '%s weeks', $count, 'buddypress' ), $count );
+ break;
+ case DAY_IN_SECONDS :
+ $output = sprintf( _n( '%s day', '%s days', $count, 'buddypress' ), $count );
+ break;
+ case HOUR_IN_SECONDS :
+ $output = sprintf( _n( '%s hour', '%s hours', $count, 'buddypress' ), $count );
+ break;
+ case MINUTE_IN_SECONDS :
+ $output = sprintf( _n( '%s minute', '%s minutes', $count, 'buddypress' ), $count );
+ break;
+ default:
+ $output = sprintf( _n( '%s second', '%s seconds', $count, 'buddypress' ), $count );
+ }
</ins><span class="cx">
</span><span class="cx"> // Step two: the second chunk
</span><span class="cx"> if ( $i + 2 < $j ) {
</span><del>- $seconds2 = $chunks[$i + 1][0];
- $name2 = $chunks[$i + 1][1];
</del><ins>+ $seconds2 = $chunks[$i + 1];
</ins><span class="cx"> $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 );
</span><span class="cx">
</span><span class="cx"> // Add to output var
</span><span class="cx"> if ( 0 != $count2 ) {
</span><del>- $output .= ( 1 == $count2 ) ? _x( ',', 'Separator in time since', 'buddypress' ) . ' 1 '. $name2 : _x( ',', 'Separator in time since', 'buddypress' ) . ' ' . $count2 . ' ' . $chunks[$i + 1][2];
</del><ins>+ $output .= _x( ',', 'Separator in time since', 'buddypress' ) . ' ';
+
+ switch ( $seconds2 ) {
+ case 30 * DAY_IN_SECONDS :
+ $output .= sprintf( _n( '%s month', '%s months', $count2, 'buddypress' ), $count2 );
+ break;
+ case WEEK_IN_SECONDS :
+ $output .= sprintf( _n( '%s week', '%s weeks', $count2, 'buddypress' ), $count2 );
+ break;
+ case DAY_IN_SECONDS :
+ $output .= sprintf( _n( '%s day', '%s days', $count2, 'buddypress' ), $count2 );
+ break;
+ case HOUR_IN_SECONDS :
+ $output .= sprintf( _n( '%s hour', '%s hours', $count2, 'buddypress' ), $count2 );
+ break;
+ case MINUTE_IN_SECONDS :
+ $output .= sprintf( _n( '%s minute', '%s minutes', $count2, 'buddypress' ), $count2 );
+ break;
+ default:
+ $output .= sprintf( _n( '%s second', '%s seconds', $count2, 'buddypress' ), $count2 );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestcasescorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/core/functions.php (7101 => 7102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/core/functions.php 2013-05-24 13:26:41 UTC (rev 7101)
+++ trunk/tests/testcases/core/functions.php 2013-05-24 13:33:06 UTC (rev 7102)
</span><span class="lines">@@ -159,8 +159,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Sanity check for the singular version of 'year'
+ *
</ins><span class="cx"> * @group bp_core_time_since
</span><span class="cx"> */
</span><ins>+ public function test_bp_core_time_since_year() {
+ $now = time();
+ $then = $now - YEAR_IN_SECONDS;
+ $this->assertEquals( '1 year ago', bp_core_time_since( $then, $now ) );
+ }
+
+ /**
+ * @group bp_core_time_since
+ */
</ins><span class="cx"> public function test_bp_core_time_since_rightnow() {
</span><span class="cx"> $now = time();
</span><span class="cx"> $then = $now;
</span></span></pre>
</div>
</div>
</body>
</html>