diff --git a/src/TranslationLoaderManager.php b/src/TranslationLoaderManager.php index 89dd627..4f7f797 100644 --- a/src/TranslationLoaderManager.php +++ b/src/TranslationLoaderManager.php @@ -26,7 +26,7 @@ public function load($locale, $group, $namespace = null): array $loaderTranslations = $this->getTranslationsForTranslationLoaders($locale, $group, $namespace); - return $loaderTranslations + $fileTranslations; + return array_replace_recursive($fileTranslations, $loaderTranslations); } protected function getTranslationsForTranslationLoaders( diff --git a/tests/TransTest.php b/tests/TransTest.php index 1b44f09..f50d620 100644 --- a/tests/TransTest.php +++ b/tests/TransTest.php @@ -21,6 +21,7 @@ public function it_can_get_translations_for_language_files() { $this->assertEquals('en value', trans('file.key')); $this->assertEquals('page not found', trans('file.404.title')); + $this->assertEquals('This page does not exists', trans('file.404.message')); } /** @test */ @@ -30,6 +31,7 @@ public function it_can_get_translations_for_language_files_for_the_current_local $this->assertEquals('nl value', trans('file.key')); $this->assertEquals('pagina niet gevonden', trans('file.404.title')); + $this->assertEquals('Deze pagina bestaat niet', trans('file.404.message')); } /** @test */ @@ -40,6 +42,7 @@ public function by_default_it_will_prefer_a_db_translation_over_a_file_translati $this->assertEquals('en value from db', trans('file.key')); $this->assertEquals('page not found from db', trans('file.404.title')); + $this->assertEquals('This page does not exists', trans('file.404.message')); } /** @test */ diff --git a/tests/fixtures/lang/en/file.php b/tests/fixtures/lang/en/file.php index 9be4840..222c944 100644 --- a/tests/fixtures/lang/en/file.php +++ b/tests/fixtures/lang/en/file.php @@ -4,5 +4,6 @@ 'key' => 'en value', '404' => [ 'title' => 'page not found', + 'message' => 'This page does not exists', ], ]; diff --git a/tests/fixtures/lang/nl/file.php b/tests/fixtures/lang/nl/file.php index bd3f19a..9a57acd 100644 --- a/tests/fixtures/lang/nl/file.php +++ b/tests/fixtures/lang/nl/file.php @@ -4,5 +4,6 @@ 'key' => 'nl value', '404' => [ 'title' => 'pagina niet gevonden', + 'message' => 'Deze pagina bestaat niet', ], ];