fix: load localizations in register() instead boot()

admin-kit · Mar 24, 2023 · faf56f2 · faf56f2
1 parent 2aa2bf7
commit faf56f2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Loaders/AutoLoaderTrait.php b/src/Loaders/AutoLoaderTrait.php
@@ -18,15 +18,13 @@ trait AutoLoaderTrait
     public function runLoaderBoot(): void
     {
         $this->loadMigrationsFromShip();
-        $this->loadLocalsFromShip();
         $this->loadViewsFromShip();
         $this->loadHelpersFromShip();
         $this->loadCommandsFromShip();
 
         // Iterate over all the containers folders and autoload most of the components
         foreach ($this->getAllContainerPaths() as $containerPath) {
             $this->loadMigrationsFromContainers($containerPath);
-            $this->loadLocalsFromContainers($containerPath);
             $this->loadViewsFromContainers($containerPath);
             $this->loadHelpersFromContainers($containerPath);
             $this->loadCommandsFromContainers($containerPath);
@@ -37,10 +35,12 @@ public function runLoaderRegister(): void
     {
         $this->loadConfigsFromShip();
         $this->loadShipServiceProviderFromShip();
+        $this->loadLocalsFromShip();
 
         foreach ($this->getAllContainerPaths() as $containerPath) {
             $this->loadConfigsFromContainers($containerPath);
             $this->loadMainServiceProvidersFromContainers($containerPath);
+            $this->loadLocalsFromContainers($containerPath);
         }
     }
 }