diff --git a/system/src/Grav/Common/Language.php b/system/src/Grav/Common/Language.php index c1dfbc8fd..5dd4d5b04 100644 --- a/system/src/Grav/Common/Language.php +++ b/system/src/Grav/Common/Language.php @@ -248,6 +248,13 @@ class Language $lookup = array_shift($args); if ($this->enabled() && $lookup) { + + if ($this->config->get('system.languages.translations.fallback', true)) { + $languages = $this->getFallbackLanguages(); + } else { + $languages = (array) $this->getDefault(); + } + foreach ($this->getFallbackLanguages() as $lang) { $translation = $this->getTranslation($lang, $lookup);