diff --git a/src/Kdyby/Translation/CatalogueCompiler.php b/src/Kdyby/Translation/CatalogueCompiler.php index 4b894fc6..e2b9d3d9 100644 --- a/src/Kdyby/Translation/CatalogueCompiler.php +++ b/src/Kdyby/Translation/CatalogueCompiler.php @@ -106,7 +106,16 @@ public function compile(Translator $translator, array &$availableCatalogues, $lo } $this->catalogueFactory->createCatalogue($translator, $availableCatalogues, $locale); - $this->cache->save($cacheKey, $availableCatalogues[$locale]->all()); + + $localeTree = $translator->getFallbackLocales(); + $messages = []; + foreach (array_reverse($localeTree) as $currentLocale) { + $messages = array_merge($messages, $availableCatalogues[$currentLocale]->all()['messages']); + } + + $translations['messages'] = $messages; + $this->cache->save($cacheKey, $translations); + return $availableCatalogues; }