'mois' dont need a 's' if several months

Author: noodom

desktop/php/events.php

@@ -80,7 +80,11 @@ function timeElapsedString($datetime, $full = false)
 
     foreach ($string as $k => &$v) {
       if ($diff->$k) {
-        $v = $diff->$k . ' ' . $v . ($diff->$k > 1 ? 's' : '');
+        $value = $diff->$k;
+        if ($value > 1 && $k !== 'm') {
+            $v .= 's';
+        }
+        $v = $value . ' ' . $v;
       } else {
         unset($string[$k]);
       }

desktop/php/panel.php

@@ -120,7 +120,11 @@ function timeElapsedString($datetime, $full = false)
 
         foreach ($string as $k => &$v) {
           if ($diff->$k) {
-            $v = $diff->$k . ' ' . $v . ($diff->$k > 1 ? 's' : '');
+            $value = $diff->$k;
+            if ($value > 1 && $k !== 'm') {
+                $v .= 's';
+            }
+            $v = $value . ' ' . $v;
           } else {
             unset($string[$k]);
           }