Changeset 4658 for trunk/wp-includes/formatting.php

Timestamp:

12/21/2006 11:06:18 PM (19 years ago)

Author:

markjaquith

Message:

i18n fixes, logic cleanup, wording clarifications, and more from nbachiyski. fixes #3474

File:

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

trunk/wp-includes/formatting.php

@@ -739 +739 @@
     if ($diff <= 3600) {
         $mins = round($diff / 60);
-        if ($mins <= 1)
-            $since = __('1 min');
-        else
-            $since = sprintf( __('%s mins'), $mins);
+        if ($mins <= 1) {
+            $mins = 1;
+        }
+        $since = sprintf(__ngettext('%s min', '%s mins', $mins), $mins);
     } else if (($diff <= 86400) && ($diff > 3600)) {
         $hours = round($diff / 3600);
-        if ($hours <= 1)
-            $since = __('1 hour');
-        else
-            $since = sprintf( __('%s hours'), $hours );
+        if ($hours <= 1) {
+            $hour = 1;
+        }
+        $since = sprintf(__ngettext('%s hour', '%s hours', $hours), $hours);
     } elseif ($diff >= 86400) {
         $days = round($diff / 86400);
-        if ($days <= 1)
-            $since = __('1 day');
-        else
-            $since = sprintf( __('%s days'), $days );
+        if ($days <= 1) {
+            $days = 1;
+        }
+        $since = sprintf(__('%s day', '%s days', $days), $days);
     }
     return $since;