diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Translation] simplify getMessages.

Browse Source
This commit is contained in:
Abdellatif Ait boudad 2015-05-04 21:22:52 +00:00
parent f47d9055bc
commit db077c1f3b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Symfony/Component/Translation/Translator.php
View File

@ -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;