[Translation] Fix InvalidArgumentException when using untranslated plural forms from .po files

BjornTwachtmann · fabpot · commit fea815b2f525 · 2017-12-11T15:28:24.000-08:00
diff --git a/src/Symfony/Component/Translation/MessageSelector.php b/src/Symfony/Component/Translation/MessageSelector.php
@@ -49,10 +49,16 @@ class MessageSelector
      */
     public function choose($message, $number, $locale)
     {
-        preg_match_all('/(?:\|\||[^\|])++/', $message, $parts);
+        $parts = array();
+        if (preg_match('/^\|++$/', $message)) {
+            $parts = explode('|', $message);
+        } elseif (preg_match_all('/(?:\|\||[^\|])++/', $message, $matches)) {
+            $parts = $matches[0];
+        }
+
         $explicitRules = array();
         $standardRules = array();
-        foreach ($parts[0] as $part) {
+        foreach ($parts as $part) {
             $part = trim(str_replace('||', '|', $part));
 
             if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/xs', $part, $matches)) {
@@ -76,7 +82,7 @@ public function choose($message, $number, $locale)
         if (!isset($standardRules[$position])) {
             // when there's exactly one rule given, and that rule is a standard
             // rule, use this rule
-            if (1 === count($parts[0]) && isset($standardRules[0])) {
+            if (1 === count($parts) && isset($standardRules[0])) {
                 return $standardRules[0];
             }
 
diff --git a/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php b/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
@@ -128,6 +128,10 @@ public function getChooseTests()
             array("This is a text with a\nnew-line in it. Selector = 1.", "{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.", 1),
             // esacape pipe
             array('This is a text with | in it. Selector = 0.', '{0}This is a text with || in it. Selector = 0.|{1}This is a text with || in it. Selector = 1.', 0),
+            // Empty plural set (2 plural forms) from a .PO file
+            array('', '|', 1),
+            // Empty plural set (3 plural forms) from a .PO file
+            array('', '||', 1),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,10 @@ public function getChooseTests()`
`128`	`128`	`array("This is a text with a\nnew-line in it. Selector = 1.", "{0}This is a text with a\nnew-line in it. Selector = 0.\|{1}This is a text with a\nnew-line in it. Selector = 1.\|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.", 1),`
`129`	`129`	`// esacape pipe`
`130`	`130`	`array('This is a text with \| in it. Selector = 0.', '{0}This is a text with \|\| in it. Selector = 0.\|{1}This is a text with \|\| in it. Selector = 1.', 0),`
	`131`	`+ // Empty plural set (2 plural forms) from a .PO file`
	`132`	`+ array('', '\|', 1),`
	`133`	`+ // Empty plural set (3 plural forms) from a .PO file`
	`134`	`+ array('', '\|\|', 1),`
`131`	`135`	`);`
`132`	`136`	`}`
`133`	`137`	`}`