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

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: #2038
symfony · Aug 28, 2011 · 8497f5f · 8497f5f
2 parents 07bdb8a + 723cb71
commit 8497f5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Symfony/Component/Translation/Interval.php b/src/Symfony/Component/Translation/Interval.php
@@ -80,13 +80,13 @@ static public function getIntervalRegexp()
 
             |
 
-        (?<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;
     }
 

diff --git a/src/Symfony/Component/Translation/MessageSelector.php b/src/Symfony/Component/Translation/MessageSelector.php
@@ -54,7 +54,7 @@ public function choose($message, $number, $locale)
         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];