Skip to content

Commit 398e0ee

Browse files
committed
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.
2 parents e019ff5 + 055a6ab commit 398e0ee

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

Translator.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,10 @@ protected function getLoaders()
273273
*/
274274
public function getMessages($locale = null)
275275
{
276-
$catalogues = array();
277-
$catalogues[] = $catalogue = $this->getCatalogue($locale);
276+
$catalogue = $this->getCatalogue($locale);
277+
$messages = $catalogue->all();
278278
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);
279+
$messages = array_replace_recursive($catalogue->all(), $messages);
285280
}
286281

287282
return $messages;

0 commit comments

Comments
 (0)