php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 15:31:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

a parser that is able to deal with the right number of args

Browse Source
This commit is contained in:
Carsten Brandt
2013-10-16 04:14:58 +02:00
parent 6fc5f0a4ca
commit b8099cbf28
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
framework/yii/i18n/MessageFormatter.php
View File

@@ -64,16 +64,41 @@ class MessageFormatter extends \MessageFormatter
private static function replaceNamedArguments($pattern, $args) private static function replaceNamedArguments($pattern, $args)
{ {
$map = array_flip(array_keys($args)); $map = array_flip(array_keys($args));
return preg_replace_callback('~({\s*)([\d\w]+)(\s*[,}])~u', function ($input) use ($map) {
$name = $input[2]; // parsing http://icu-project.org/apiref/icu4c/classMessageFormat.html#details
if (isset($map[$name])) { $parts = explode('{', $pattern);
return $input[1] . $map[$name] . $input[3]; $c = count($parts);
$pattern = $parts[0];
$d = 0;
$stack = array();
for($i = 1; $i < $c; $i++) {
if (preg_match('~^\A(\s*)([\d\w]+)(\s*)([},])(\s*)(.*)\z$~u', $parts[$i], $matches)) {
$d++;
// replace normal arg if it was set
if (isset($map[$matches[2]])) {
$q = '';
$pattern .= '{' . $matches[1] . $map[$matches[2]] . $matches[3];
} else {
// quote unused args
$q = '';//($matches[4] == '}' && isset($stack[$d]) && !($stack[$d] == 'plural' || $stack[$d] == 'select')) ? "'" : "";
$pattern .= "$q{" . $matches[1] . $matches[2] . $matches[3];
}
$pattern .= ($term = $matches[4] . $q . $matches[5] . $matches[6]);
// check type current level
$stack[$d] = ($matches[4] == ',') ? substr($matches[6], 0, 6) : 'none';
// if it's plural or select, the next bracket is NOT begin of a message then!
if ($stack[$d] == 'plural' || $stack[$d] == 'select') {
$i++;
$d -= substr_count($term, '}');
} else {
$d -= substr_count($term, '}');
continue;
}
} }
else { $pattern .= '{' . $parts[$i];
//return $input[1] . $name . $input[3]; $d += 1 - substr_count($parts[$i], '}');
return "'" . $input[1] . $name . $input[3] . "'"; }
} return $pattern;
}, $pattern);
} }
/** /**