minor #14549 [Translation] simplify getMessages. (aitboudad)
This PR was merged into the 2.6 branch.
Discussion
----------
[Translation] simplify getMessages.
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Fixed tickets | ~
| Tests pass? | yes
| License | MIT
Commits
-------
db077c1
[Translation] simplify getMessages.
This commit is contained in:
commit
09cb24bbad
@ -273,15 +273,10 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
|
|||||||
*/
|
*/
|
||||||
public function getMessages($locale = null)
|
public function getMessages($locale = null)
|
||||||
{
|
{
|
||||||
$catalogues = array();
|
$catalogue = $this->getCatalogue($locale);
|
||||||
$catalogues[] = $catalogue = $this->getCatalogue($locale);
|
$messages = $catalogue->all();
|
||||||
while ($catalogue = $catalogue->getFallbackCatalogue()) {
|
while ($catalogue = $catalogue->getFallbackCatalogue()) {
|
||||||
$catalogues[] = $catalogue;
|
$messages = array_replace_recursive($catalogue->all(), $messages);
|
||||||
}
|
|
||||||
$messages = array();
|
|
||||||
for ($i = count($catalogues) - 1; $i >= 0; $i--) {
|
|
||||||
$localeMessages = $catalogues[$i]->all();
|
|
||||||
$messages = array_replace_recursive($messages, $localeMessages);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $messages;
|
return $messages;
|
||||||
|
Reference in New Issue
Block a user