Merge branch 'laravel-v9.x'

ARCANEDEV · Oct 6, 2023 · 5326ed2 · 5326ed2
2 parents 7abc580 + abb0038
commit 5326ed2
Showing 1 changed file with 4 additions and 3 deletions.
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);
     }
 }