Fix #30215 handle plural for floating numbers

kylekatarnls · kylekatarnls · commit 149a905ce5e0 · 2021-01-18T23:57:37.000+01:00
diff --git a/src/Symfony/Component/Translation/IdentityTranslator.php b/src/Symfony/Component/Translation/IdentityTranslator.php
@@ -70,7 +70,7 @@ public function transChoice($id, $number, array $parameters = [], $domain = null
         return $this->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);
     }
 
-    private function getPluralizationRule(int $number, string $locale): int
+    private function getPluralizationRule(float $number, string $locale): int
     {
         return PluralizationRules::get($number, $locale, false);
     }
diff --git a/src/Symfony/Component/Translation/PluralizationRules.php b/src/Symfony/Component/Translation/PluralizationRules.php
@@ -144,7 +144,7 @@ public static function get($number, $locale/*, bool $triggerDeprecation = true*/
             case 'xbr':
             case 'ti':
             case 'wa':
-                return ((0 == $number) || (1 == $number)) ? 0 : 1;
+                return ($number < 2) ? 0 : 1;
 
             case 'be':
             case 'bs':
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -612,6 +612,11 @@ public function getTransChoiceTests()
 
             // Override %count% with a custom value
             ['Il y a quelques pommes', 'one: There is one apple|more: There are %count% apples', 'one: Il y a %count% pomme|more: Il y a quelques pommes', 2, ['%count%' => 'quelques'], 'fr', ''],
+
+            // Floating values
+            // https://github.com/symfony/symfony/issues/30215
+            ['1.5 liters', 'key', '%count% liter|%count% liters', 1.5, ['%count%' => 1.5], 'en', ''],
+            ['1.5 litre', 'key', '%count% litre|%count% litres', 1.5, ['%count%' => 1.5], 'fr', ''],
         ];
     }
 
diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
@@ -136,7 +136,7 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
      * which is subject to the new BSD license (http://framework.zend.com/license/new-bsd).
      * Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
      */
-    private function getPluralizationRule(int $number, string $locale): int
+    private function getPluralizationRule(float $number, string $locale): int
     {
         switch ('pt_BR' !== $locale && \strlen($locale) > 3 ? substr($locale, 0, strrpos($locale, '_')) : $locale) {
             case 'af':
@@ -205,7 +205,7 @@ private function getPluralizationRule(int $number, string $locale): int
             case 'pt_BR':
             case 'ti':
             case 'wa':
-                return ((0 == $number) || (1 == $number)) ? 0 : 1;
+                return ($number < 2) ? 0 : 1;
 
             case 'be':
             case 'bs':

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function transChoice($id, $number, array $parameters = [], $domain = null`
`70`	`70`	`return $this->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);`
`71`	`71`	`}`
`72`	`72`
`73`		`- private function getPluralizationRule(int $number, string $locale): int`
	`73`	`+ private function getPluralizationRule(float $number, string $locale): int`
`74`	`74`	`{`
`75`	`75`	`return PluralizationRules::get($number, $locale, false);`
`76`	`76`	`}`