From 6208b12942a76484c6a6056436d240bb90821278 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Wed, 16 Jul 2014 14:57:46 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20waiting=20time=20text=20=09modifi=C3=A9:?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20core/lib/Thelia/Form/FirewallForm.ph?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/lib/Thelia/Form/FirewallForm.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Form/FirewallForm.php b/core/lib/Thelia/Form/FirewallForm.php
index 837b394f1..c0cbeea13 100644
--- 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;