diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature #17662 [Translation][transChoice] allows escaping the pipe character. (aitboudad) 

This PR was merged into the 3.2-dev branch.

Discussion
----------

[Translation][transChoice] allows escaping the pipe character.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Fixed tickets  | #15195
| Tests pass?   | yes
| License       | MIT

Commits
-------

a35a93b [Translation][transChoice] allows escaping the pipe character.
This commit is contained in:
Fabien Potencier 2016-06-14 22:35:45 +02:00
parent 5280d5dc9c a35a93bf49
commit f400f01ecc
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/Translation/CHANGELOG.md
View File

@ -1,6 +1,11 @@
CHANGELOG
=========
3.2.0
-----
* Added support for escaping `|` in plural translations with double pipe.
3.1.0
-----

8
src/Symfony/Component/Translation/MessageSelector.php
View File

@ -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 @@ class MessageSelector
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];
}

2
src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
View File

@ -125,6 +125,8 @@ class MessageSelectorTest extends \PHPUnit_Framework_TestCase
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),
);
}
}