X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/cac31b2074cc0429423ffe7b8646ca0b5b367fe6..refs/pull/3593/head:/app/Translation/FileLoader.php diff --git a/app/Translation/FileLoader.php b/app/Translation/FileLoader.php index 775eefc47..de1124046 100644 --- a/app/Translation/FileLoader.php +++ b/app/Translation/FileLoader.php @@ -26,7 +26,8 @@ class FileLoader extends BaseLoader if (is_null($namespace) || $namespace === '*') { $themePath = theme_path('lang'); $themeTranslations = $themePath ? $this->loadPath($themePath, $locale, $group) : []; - $originalTranslations = $this->loadPath($this->path, $locale, $group); + $originalTranslations = $this->loadPath($this->path, $locale, $group); + return array_merge($originalTranslations, $themeTranslations); }