- implemented php side of plural translation

- using it to generate labels dynamically for the expire options
(deprecating the [expire_labels] configuration).
- added translation of the human readable data sizes to support the
french octet
- fixed IEC label for kibibytes

lib/filter.php

@@ -33,7 +33,36 @@ class filter
     }
 
     /**
-     * format a given number of bytes
+     * format a given time string into a human readable label (localized)
+     *
+     * accepts times in the format "[integer][time unit]"
+     *
+     * @access public
+     * @static
+     * @param  string $time
+     * @throws Exception
+     * @return string
+     */
+    public static function time_humanreadable($time)
+    {
+        if (preg_match('/^(\d+) *(\w+)$/', $time, $matches) !== 1) {
+            throw new Exception("Error parsing time format '$time'", 30);
+        }
+        switch ($matches[2]) {
+            case 'sec':
+                $unit = 'second';
+                break;
+            case 'min':
+                $unit = 'minute';
+                break;
+            default:
+                $unit = rtrim($matches[2], 's');
+        }
+        return i18n::_(array('%d ' . $unit, '%d ' . $unit . 's'), (int) $matches[1]);
+    }
+
+    /**
+     * format a given number of bytes in IEC 80000-13:2008 notation (localized)
      *
      * @access public
      * @static
@@ -42,13 +71,13 @@ class filter
      */
     public static function size_humanreadable($size)
     {
-        $iec = array('B', 'kiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB');
+        $iec = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB');
         $i = 0;
         while ( ( $size / 1024 ) >= 1 ) {
                 $size = $size / 1024;
                 $i++;
         }
-        return number_format($size, ($i ? 2 : 0), '.', ' ') . ' ' . $iec[$i];
+        return number_format($size, ($i ? 2 : 0), '.', ' ') . ' ' . i18n::_($iec[$i]);
     }
 
     /**