Merge branch 'master' of github.com:spatie/laravel-translation-loader

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(

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 */

tests/fixtures/lang/en/file.php

@@ -4,5 +4,6 @@
     'key' => 'en value',
     '404' => [
         'title' => 'page not found',
+        'message' => 'This page does not exists',
     ],
 ];

tests/fixtures/lang/nl/file.php

@@ -4,5 +4,6 @@
     'key' => 'nl value',
     '404' => [
         'title'   => 'pagina niet gevonden',
+        'message' => 'Deze pagina bestaat niet',
     ],
 ];