Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b235fef

Browse filesBrowse files
kylekatarnlsnicolas-grekas
authored andcommitted
[Translator] fix handling plural for floating numbers
1 parent 6dd5078 commit b235fef
Copy full SHA for b235fef

File tree

4 files changed

+17
-4
lines changed
Filter options

4 files changed

+17
-4
lines changed

‎src/Symfony/Component/Translation/IdentityTranslator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/IdentityTranslator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function transChoice($id, $number, array $parameters = [], $domain = null
7070
return $this->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);
7171
}
7272

73-
private function getPluralizationRule(int $number, string $locale): int
73+
private function getPluralizationRule(float $number, string $locale): int
7474
{
7575
return PluralizationRules::get($number, $locale, false);
7676
}

‎src/Symfony/Component/Translation/PluralizationRules.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/PluralizationRules.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public static function get($number, $locale/*, bool $triggerDeprecation = true*/
144144
case 'xbr':
145145
case 'ti':
146146
case 'wa':
147-
return ((0 == $number) || (1 == $number)) ? 0 : 1;
147+
return ($number < 2) ? 0 : 1;
148148

149149
case 'be':
150150
case 'bs':

‎src/Symfony/Component/Translation/Tests/TranslatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/TranslatorTest.php
+13Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ public function testTransChoiceInvalidLocale($locale)
502502
/**
503503
* @dataProvider getValidLocalesTests
504504
* @group legacy
505+
* @group i
505506
*/
506507
public function testTransChoiceValidLocale($locale)
507508
{
@@ -612,6 +613,18 @@ public function getTransChoiceTests()
612613

613614
// Override %count% with a custom value
614615
['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', ''],
616+
617+
// Floating values
618+
['1.5 liters', 'key', '%count% liter|%count% liters', 1.5, ['%count%' => 1.5], 'en', ''],
619+
['1.5 litre', 'key', '%count% litre|%count% litres', 1.5, ['%count%' => 1.5], 'fr', ''],
620+
621+
// Negative values
622+
['-1 degree', 'key', '%count% degree|%count% degrees', -1, ['%count%' => -1], 'en', ''],
623+
['-1 degré', 'key', '%count% degré|%count% degrés', -1, ['%count%' => -1], 'fr', ''],
624+
['-1.5 degrees', 'key', '%count% degree|%count% degrees', -1.5, ['%count%' => -1.5], 'en', ''],
625+
['-1.5 degré', 'key', '%count% degré|%count% degrés', -1.5, ['%count%' => -1.5], 'fr', ''],
626+
['-2 degrees', 'key', '%count% degree|%count% degrees', -2, ['%count%' => -2], 'en', ''],
627+
['-2 degrés', 'key', '%count% degré|%count% degrés', -2, ['%count%' => -2], 'fr', ''],
615628
];
616629
}
617630

‎src/Symfony/Contracts/Translation/TranslatorTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Contracts/Translation/TranslatorTrait.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
136136
* which is subject to the new BSD license (http://framework.zend.com/license/new-bsd).
137137
* Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
138138
*/
139-
private function getPluralizationRule(int $number, string $locale): int
139+
private function getPluralizationRule(float $number, string $locale): int
140140
{
141141
switch ('pt_BR' !== $locale && \strlen($locale) > 3 ? substr($locale, 0, strrpos($locale, '_')) : $locale) {
142142
case 'af':
@@ -205,7 +205,7 @@ private function getPluralizationRule(int $number, string $locale): int
205205
case 'pt_BR':
206206
case 'ti':
207207
case 'wa':
208-
return ((0 == $number) || (1 == $number)) ? 0 : 1;
208+
return ($number < 2) ? 0 : 1;
209209

210210
case 'be':
211211
case 'bs':

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.