symfony
diff --git a/‎src/Symfony/Component/Translation/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Translation/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/MessageSelector.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/MessageSelector.php
+4-4Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Translation/MessageSelector.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/MessageSelector.php
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
+2Lines changed: 2 additions & 0 deletions
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.2.0
+-----
+
+ * Added support for escaping `|` in plural translations with double pipe.
+
 3.1.0
 -----
 
 
@@ -47,11 +47,11 @@ class MessageSelector
      */
     public function choose($message, $number, $locale)
     {
-        $parts = explode('|', $message);
+        preg_match_all('/(?:\|\||[^\|])++/', $message, $parts);
         $explicitRules = array();
         $standardRules = array();
-        foreach ($parts as $part) {
-            $part = trim($part);
+        foreach ($parts[0] as $part) {
+            $part = trim(str_replace('||', '|', $part));
 
             if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/xs', $part, $matches)) {
                 $explicitRules[$matches['interval']] = $matches['message'];
@@ -74,7 +74,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) && isset($standardRules[0])) {
+            if (1 === count($parts[0]) && isset($standardRules[0])) {
                 return $standardRules[0];
             }
 
 
@@ -125,6 +125,8 @@ public function getChooseTests()
             array('This is a text with a\nnew-line in it. Selector = 0.', '{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.', 0),
             // with double-quotes and id split accros lines
             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),
         );
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,8 @@ public function getChooseTests()`
`125`	`125`	`array('This is a text with a\nnew-line in it. Selector = 0.', '{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.', 0),`
`126`	`126`	`// with double-quotes and id split accros lines`
`127`	`127`	`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),`
	`128`	`+ // esacape pipe`
	`129`	`+ 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),`
`128`	`130`	`);`
`129`	`131`	`}`
`130`	`132`	`}`