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

merged branch aggressivex/translation-pcre-patch (PR #2047)

Browse Source 
Commits
-------

723cb71 [Translation] Add compatibility to PCRE 6.6.0 for explicit interval pluralization

Discussion
----------

[Translation] Add compatibility to PCRE 6.6.0 for explicit interval pluralization

[Translation] Add compatibility to PCRE 6.6.0 for explicit interval pluralization

Corrected branches: From 2.0 to 2.0

more info: https://github.com/symfony/symfony/pull/2038
This commit is contained in:
Fabien Potencier 2011-08-28 22:32:31 +02:00
commit 8497f5f7fc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,13 +80,13 @@ class Interval
|
(?<left_delimiter>[\[\]])
(?P<left_delimiter>[\[\]])
\s*
(?<left>-Inf|\-?\d+)
(?P<left>-Inf|\-?\d+)
\s*,\s*
(?<right>\+?Inf|\-?\d+)
(?P<right>\+?Inf|\-?\d+)
\s*
(?<right_delimiter>[\[\]])
(?P<right_delimiter>[\[\]])
EOF;
}

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

@ -54,7 +54,7 @@ class MessageSelector
foreach ($parts as $part) {
$part = trim($part);
if (preg_match('/^(?<interval>'.Interval::getIntervalRegexp().')\s+(?<message>.+?)$/x', $part, $matches)) {
if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s+(?P<message>.+?)$/x', $part, $matches)) {
$explicitRules[$matches['interval']] = $matches['message'];
} elseif (preg_match('/^\w+\: +(.+)$/', $part, $matches)) {
$standardRules[] = $matches[1];