Merge pull request jimmiw#73 from marlon-be/master

Fix issue jimmiw#72 calculate correctly "isLessThan44Min29Secs"

Author: jimmiw

src/Westsworld/TimeAgo/Language.php

@@ -201,8 +201,8 @@ private function isLessThan44Min29Secs(DateInterval $timeDifference)
             return false;
         };
 
-        return $timeDifference->i < 45 &&
-            $timeDifference->s < 30 &&
+        return ($timeDifference->i < 44 ||
+            ($timeDifference->i === 44 && $timeDifference->s < 30)) &&
             ! $this->isLessThan1Min29Seconds($timeDifference);
     }
 

tests/TimeagoTest.php

@@ -46,6 +46,7 @@ public function testTimeAgoInWords()
 
         // testing 2..44 minutes
         $this->assertContains('minutes ago', $timeAgo->inWordsFromStrings("-2 minute"));
+        $this->assertContains('minutes ago', $timeAgo->inWordsFromStrings("-2 minute -40 second"));
         $this->assertContains('minutes ago', $timeAgo->inWordsFromStrings("-44 minute"));
         $this->assertContains('minutes ago', $timeAgo->inWordsFromStrings("-44 minute -29 second"));
         $this->assertNotContains('minutes ago', $timeAgo->inWordsFromStrings("-44 minute -30 second"));