Merge branch 'laravel-v9.x'

arcanedev-maroc · arcanedev-maroc · commit 5326ed2090ab · 2023-10-06T14:55:57.000+01:00
diff --git a/src/Providers/Concerns/HasTranslations.php b/src/Providers/Concerns/HasTranslations.php
@@ -57,9 +57,10 @@ protected function publishTranslations(?string $path = null): void
      */
     protected function loadTranslations(): void
     {
-        $path = $this->getTranslationsPath();
+        $packagePath = $this->getTranslationsPath();
+        $vendorPath = $this->getTranslationsDestinationPath();
 
-        $this->loadTranslationsFrom($path, $this->getPackageName());
-        $this->loadJsonTranslationsFrom($path);
+        $this->loadTranslationsFrom($packagePath, $this->getPackageName());
+        $this->loadJsonTranslationsFrom(file_exists($vendorPath) ? $vendorPath : $packagePath);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,10 @@ protected function publishTranslations(?string $path = null): void`
`57`	`57`	`*/`
`58`	`58`	`protected function loadTranslations(): void`
`59`	`59`	`{`
`60`		`- $path = $this->getTranslationsPath();`
	`60`	`+ $packagePath = $this->getTranslationsPath();`
	`61`	`+ $vendorPath = $this->getTranslationsDestinationPath();`
`61`	`62`
`62`		`- $this->loadTranslationsFrom($path, $this->getPackageName());`
`63`		`- $this->loadJsonTranslationsFrom($path);`
	`63`	`+ $this->loadTranslationsFrom($packagePath, $this->getPackageName());`
	`64`	`+ $this->loadJsonTranslationsFrom(file_exists($vendorPath) ? $vendorPath : $packagePath);`
`64`	`65`	`}`
`65`	`66`	`}`