Ticket #9272: 9272.2.patch

wp-includes/formatting.php

@@ -1839 +1839 @@
  * Determines the difference between two timestamps.
  *
  * The difference is returned in a human readable format such as "1 hour",
- * "5 mins", "2 days".
+ * "5 mins", "2 days", or "5 days, 2 hours" (limit=2).
  *
  * @since 1.5.0
  *
  * @param int $from Unix timestamp from which the difference begins.
  * @param int $to Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
+ * @param int $limit Optional. The number of unit types to display (i.e. the accuracy). Defaults to 1.
+ * @param boolean $seconds Output seconds too if $limit isn't reached.
  * @return string Human readable time difference.
  */
-function human_time_diff( $from, $to = '' ) {
-        if ( empty($to) )
+function human_time_diff( $from, $to = null, $limit = 1, $seconds = false ) {
+        // Since all months/years aren't the same, these values are what Google's calculator says
+        // This needs to be sorted from largest unit to smallest unit
+        $units = array(
+                31556926 => array( __( '%d year' ),  __( '%d years' ) ),
+                2629744  => array( __( '%d month' ), __( '%d months' ) ),
+                604800   => array( __( '%d week' ),  __( '%d weeks' ) ),
+                86400    => array( __( '%d day' ),   __( '%d days' ) ),
+                3600     => array( __( '%d hour' ),  __( '%d hours' ) ),
+                60       => array( __( '%d min' ),   __( '%d mins' ) ),
+        );
+
+        if ( $seconds )
+                $units[1] = array( __( '%d sec' ),   __( '%d secs' ) );
+
+        $units = apply_filters( 'time_units', $units );
+
+        $from = (int) $from;
+        $to   = (int) $to;
+
+        if ( empty( $to ) )
                 $to = time();
-        $diff = (int) abs($to - $from);
-        if ($diff <= 3600) {
-                $mins = round($diff / 60);
-                if ($mins <= 1) {
-                        $mins = 1;
-                }
-                /* translators: min=minute */
-                $since = sprintf(_n('%s min', '%s mins', $mins), $mins);
-        } else if (($diff <= 86400) && ($diff > 3600)) {
-                $hours = round($diff / 3600);
-                if ($hours <= 1) {
-                        $hours = 1;
-                }
-                $since = sprintf(_n('%s hour', '%s hours', $hours), $hours);
-        } elseif ($diff >= 86400) {
-                $days = round($diff / 86400);
-                if ($days <= 1) {
-                        $days = 1;
-                }
-                $since = sprintf(_n('%s day', '%s days', $days), $days);
+
+        $diff = abs( $to - $from );
+
+        $items = 0;
+        $output = array();
+
+        foreach ( $units as $unitsec => $unitnames ) {
+                // Stop when the item limit is reached
+                if ( $items >= $limit )
+                        break;
+
+                // Make sure the unit size is smaller than the remainder seconds
+                if ( $diff < $unitsec )
+                        continue;
+
+                // Find the whole number of this unit
+                $numthisunits = floor( $diff / $unitsec );
+                $diff = $diff - ( $numthisunits * $unitsec );
+                $items++;
+
+                if ( $numthisunits > 0 )
+                        $output[] = sprintf( _n( $unitnames[0], $unitnames[1], $numthisunits ), $numthisunits );
         }
-        return $since;
+
+        // translators: The seperator for human_time_diff() which seperates the years, months, etc.
+        $seperator = _x( ', ', 'human_time_diff' );
+
+        if ( ! empty( $output ) ) {
+                if ( is_rtl() )
+                        $output = array_reverse( $output );
+
+                return implode( $seperator, $output );
+        } else {
+                // Return "1 {unit}" with the unit being the smallest unit
+                $smallest = array_pop( $units );
+                return sprintf( $smallest[0], 1 );
+        }
 }
 
 /**