updated core and modules
This commit is contained in:
+5
-5
@@ -159,7 +159,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
|
||||
*
|
||||
* @throws \InvalidArgumentException If a locale contains invalid characters
|
||||
*
|
||||
* @deprecated since version 2.3, to be removed in 3.0. Use setFallbackLocales() instead.
|
||||
* @deprecated since version 2.3, to be removed in 3.0. Use setFallbackLocales() instead
|
||||
*/
|
||||
public function setFallbackLocale($locales)
|
||||
{
|
||||
@@ -380,9 +380,9 @@ EOF
|
||||
$fallbackSuffix = ucfirst(preg_replace($replacementPattern, '_', $fallback));
|
||||
$currentSuffix = ucfirst(preg_replace($replacementPattern, '_', $current));
|
||||
|
||||
$fallbackContent .= sprintf(<<<EOF
|
||||
\$catalogue%s = new MessageCatalogue('%s', %s);
|
||||
\$catalogue%s->addFallbackCatalogue(\$catalogue%s);
|
||||
$fallbackContent .= sprintf(<<<'EOF'
|
||||
$catalogue%s = new MessageCatalogue('%s', %s);
|
||||
$catalogue%s->addFallbackCatalogue($catalogue%s);
|
||||
|
||||
EOF
|
||||
,
|
||||
@@ -424,7 +424,7 @@ EOF
|
||||
|
||||
foreach ($this->computeFallbackLocales($locale) as $fallback) {
|
||||
if (!isset($this->catalogues[$fallback])) {
|
||||
$this->doLoadCatalogue($fallback);
|
||||
$this->loadCatalogue($fallback);
|
||||
}
|
||||
|
||||
$fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());
|
||||
|
||||
Reference in New Issue
Block a user