Fix waiting time text

modifié: core/lib/Thelia/Form/FirewallForm.php
2014-07-16 14:57:46 +02:00
parent 28e027bca4
commit 6208b12942
1 changed files with 3 additions and 1 deletions
--- a/core/lib/Thelia/Form/FirewallForm.php
+++ b/core/lib/Thelia/Form/FirewallForm.php
@@ -114,7 +114,7 @@ abstract class FirewallForm extends BaseForm
        $minutesName = $translator->trans("minute(s)");
        $text = "";

-        if ($minutes > 60) {
+        if ($minutes >= 60) {
            $hour = floor($minutes / 60);
            $minutes %= 60;
            $text = $hour . " " . $translator->trans("hour(s)") . " ";
@@ -122,6 +122,8 @@ abstract class FirewallForm extends BaseForm

        if ($minutes !== 0) {
            $text .= $minutes . " " . $minutesName;
+        } else {
+            $text = rtrim($text);
        }

        return $text;