diff --git a/Translator.php b/Translator.php index 81ed9052..e21c705f 100644 --- a/Translator.php +++ b/Translator.php @@ -273,15 +273,10 @@ protected function getLoaders() */ public function getMessages($locale = null) { - $catalogues = array(); - $catalogues[] = $catalogue = $this->getCatalogue($locale); + $catalogue = $this->getCatalogue($locale); + $messages = $catalogue->all(); while ($catalogue = $catalogue->getFallbackCatalogue()) { - $catalogues[] = $catalogue; - } - $messages = array(); - for ($i = count($catalogues) - 1; $i >= 0; $i--) { - $localeMessages = $catalogues[$i]->all(); - $messages = array_replace_recursive($messages, $localeMessages); + $messages = array_replace_recursive($catalogue->all(), $messages); } return $messages;