projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to Drupal 8.5. Core Media not yet in use.
[yaffs-website]
/
vendor
/
symfony
/
translation
/
MessageSelector.php
diff --git
a/vendor/symfony/translation/MessageSelector.php
b/vendor/symfony/translation/MessageSelector.php
index c6134191bce084acaea696f2037a6018bd0e0c72..31304cd0d89ed4b9b996cfa99bc0ef8f35f7d8e4 100644
(file)
--- a/
vendor/symfony/translation/MessageSelector.php
+++ b/
vendor/symfony/translation/MessageSelector.php
@@
-49,10
+49,16
@@
class MessageSelector
*/
public function choose($message, $number, $locale)
{
*/
public function choose($message, $number, $locale)
{
- preg_match_all('/(?:\|\||[^\|])++/', $message, $parts);
+ $parts = array();
+ if (preg_match('/^\|++$/', $message)) {
+ $parts = explode('|', $message);
+ } elseif (preg_match_all('/(?:\|\||[^\|])++/', $message, $matches)) {
+ $parts = $matches[0];
+ }
+
$explicitRules = array();
$standardRules = array();
$explicitRules = array();
$standardRules = array();
- foreach ($parts
[0]
as $part) {
+ foreach ($parts as $part) {
$part = trim(str_replace('||', '|', $part));
if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/xs', $part, $matches)) {
$part = trim(str_replace('||', '|', $part));
if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/xs', $part, $matches)) {
@@
-76,7
+82,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 (!isset($standardRules[$position])) {
// when there's exactly one rule given, and that rule is a standard
// rule, use this rule
- if (1 === count($parts
[0]
) && isset($standardRules[0])) {
+ if (1 === count($parts) && isset($standardRules[0])) {
return $standardRules[0];
}
return $standardRules[0];
}