Changeset 2657 for trunk/system/helpers/date.php

Timestamp:

05/07/2008 11:08:35 AM (7 months ago)

Author:

Shadowhand

Message:

Follow up to r2655, it's a good thing to have working methods.

Files:

• trunk/system/helpers/date.php (modified) (1 diff)

trunk/system/helpers/date.php

@@ -380 +380 @@
                                         continue;
                                 }
-                                elseif ($amount === 1)
-                                {
-                                        // Make the name singualr
-                                        $name = inflector::singular($name);
-                                }
-
-                                if ($name === $last)
-                                {
-                                        // Add "and"
-                                        $amount = 'and '.$amount;
-                                }
 
                                 // Add the amount to the span
-                                $span[] = $amount.' '.$name;
+                                $span[] = ($name === $last ? ' and ' : ', ').$amount.' '.($amount === 1 ? inflector::singular($name) : $name);
                         }
 
-                        $difference = implode(', ', $span).' ago';
+                        // Replace difference by making the span into a string
+                        $difference = trim(implode('', $span), ',').' ago';
                 }