Changeset 24582

Timestamp:

07/08/2013 01:00:34 PM (11 years ago)

Author:

nacin

Message:

Expand human_time_diff() from minutes/hours/days to also include weeks/months/years. Fix off-by-one issue.

props SergeyBiryukov, westi.
fixes #9272.

File:

• trunk/wp-includes/formatting.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -2134 +2134 @@
     if ( empty( $to ) )
         $to = time();
+
     $diff = (int) abs( $to - $from );
-    if ( $diff <= HOUR_IN_SECONDS ) {
+
+    if ( $diff < HOUR_IN_SECONDS ) {
         $mins = round( $diff / MINUTE_IN_SECONDS );
-        if ( $mins <= 1 ) {
+        if ( $mins <= 1 )
             $mins = 1;
-        }
         /* translators: min=minute */
         $since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
-    } elseif ( ( $diff <= DAY_IN_SECONDS ) && ( $diff > HOUR_IN_SECONDS ) ) {
+    } elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
         $hours = round( $diff / HOUR_IN_SECONDS );
-        if ( $hours <= 1 ) {
+        if ( $hours <= 1 )
             $hours = 1;
-        }
         $since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
-    } elseif ( $diff >= DAY_IN_SECONDS ) {
+    } elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
         $days = round( $diff / DAY_IN_SECONDS );
-        if ( $days <= 1 ) {
+        if ( $days <= 1 )
             $days = 1;
-        }
         $since = sprintf( _n( '%s day', '%s days', $days ), $days );
-    }
+    } elseif ( $diff < 30 * DAY_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
+        $weeks = round( $diff / WEEK_IN_SECONDS );
+        if ( $weeks <= 1 )
+            $weeks = 1;
+        $since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
+    } elseif ( $diff < YEAR_IN_SECONDS && $diff >= 30 * DAY_IN_SECONDS ) {
+        $months = round( $diff / ( 30 * DAY_IN_SECONDS ) );
+        if ( $months <= 1 )
+            $months = 1;
+        $since = sprintf( _n( '%s month', '%s months', $months ), $months );
+    } elseif ( $diff >= YEAR_IN_SECONDS ) {
+        $years = round( $diff / YEAR_IN_SECONDS );
+        if ( $years <= 1 )
+            $years = 1;
+        $since = sprintf( _n( '%s year', '%s years', $years ), $years );
+    }
+
     return $since;
 }