We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent c24394e commit 055a6abCopy full SHA for 055a6ab
Translator.php
@@ -273,15 +273,10 @@ protected function getLoaders()
273
*/
274
public function getMessages($locale = null)
275
{
276
- $catalogues = array();
277
- $catalogues[] = $catalogue = $this->getCatalogue($locale);
+ $catalogue = $this->getCatalogue($locale);
+ $messages = $catalogue->all();
278
while ($catalogue = $catalogue->getFallbackCatalogue()) {
279
- $catalogues[] = $catalogue;
280
- }
281
- $messages = array();
282
- for ($i = count($catalogues) - 1; $i >= 0; $i--) {
283
- $localeMessages = $catalogues[$i]->all();
284
- $messages = array_replace_recursive($messages, $localeMessages);
+ $messages = array_replace_recursive($catalogue->all(), $messages);
285
}
286
287
return $messages;
0 commit comments