Float support added for transchoice in the Translation Component

Author: nicoschwartz

src/Symfony/Component/Translation/Interval.php

@@ -75,16 +75,16 @@ public static function getIntervalRegexp()
  {
  return <<<EOF
  ({\s*
- (\-?\d+[\s*,\s*\-?\d+]*)
+ (\-?\d+(\.\d+)?[\s*,\s*\-?\d+(\.\d+)?]*)
  \s*})
 
  |
 
  (?P<left_delimiter>[\[\]])
  \s*
- (?P<left>-Inf|\-?\d+)
+ (?P<left>-Inf|\-?\d+(\.\d+)?)
  \s*,\s*
- (?P<right>\+?Inf|\-?\d+)
+ (?P<right>\+?Inf|\-?\d+(\.\d+)?)
  \s*
  (?P<right_delimiter>[\[\]])
 EOF;
@@ -98,6 +98,6 @@ private static function convertNumber($number)
  return -log(0);
  }
 
- return (int) $number;
+ return (float) $number;
  }
 }

src/Symfony/Component/Translation/Tests/MessageSelectorTest.php

@@ -67,6 +67,14 @@ public function getChooseTests()
  array('There are %count% apples', 'There is one apple|There are %count% apples', 0),
  array('There is one apple', 'There is one apple|There are %count% apples', 1),
  array('There are %count% apples', 'There is one apple|There are %count% apples', 2),
+
+ // Tests for float numbers
+ array('There is almost one apple', '{0} There is no apples|]0,1[ There is almost one apple|{1} There is one apple|[1,Inf] There is more than one apple', 0.7),
+ array('There is one apple', '{0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1),
+ array('There is more than one apple', '{0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1.7),
+ array('There is no apples', '{0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
+ array('There is no apples', '{0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0.0),
+ array('There is no apples', '{0.0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
  );
  }
 }

src/Symfony/Component/Translation/Translator.php

@@ -157,7 +157,7 @@ public function transChoice($id, $number, array $parameters = array(), $domain =
  }
  }
 
- return strtr($this->selector->choose($catalogue->get($id, $domain), (int) $number, $locale), $parameters);
+ return strtr($this->selector->choose($catalogue->get($id, $domain), (float) $number, $locale), $parameters);
  }
 
  protected function loadCatalogue($locale)