From d0a23b756ca7cd66048613ffbee93a02094779e7 Mon Sep 17 00:00:00 2001
From: Julian Berger <jb@confluentes.com>
Date: Fri, 17 Jan 2020 23:37:50 +0100
Subject: [PATCH] Get translations from fallback catalogues (#1961)

---
 framework/core/src/Frontend/AddTranslations.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/framework/core/src/Frontend/AddTranslations.php b/framework/core/src/Frontend/AddTranslations.php
index e262f9941..5df1a91c6 100644
--- a/framework/core/src/Frontend/AddTranslations.php
+++ b/framework/core/src/Frontend/AddTranslations.php
@@ -53,7 +53,12 @@ class AddTranslations
 
     private function getTranslations(string $locale)
     {
-        $translations = $this->locales->getTranslator()->getCatalogue($locale)->all('messages');
+        $catalogue = $this->locales->getTranslator()->getCatalogue($locale);
+        $translations = $catalogue->all('messages');
+
+        while ($catalogue = $catalogue->getFallbackCatalogue()) {
+            $translations = array_replace($catalogue->all('messages'), $translations);
+        }
 
         return Arr::only(
             $translations,