Merge pull request #9 from optimistdigital/revert-7-6-issue-loading-l…

…aravel-translations Revert "fix loading laravel translations"
outl1ne · Jun 18, 2021 · bca3c2a · bca3c2a
2 parents f8dad85 + e9ed55c
commit bca3c2a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/LoadsNovaTranslations.php b/src/LoadsNovaTranslations.php
@@ -43,15 +43,15 @@ private function translations($pckgTransDir, $pckgName, $publish)
             $locale = app()->getLocale();
             $fallbackLocale = config('app.fallback_locale');
 
+            // Load Laravel translations
+            $this->loadLaravelTranslations($pckgTransDir, $pckgName);
+
             // Attempt to load Nova translations
             if ($this->loadNovaTranslations($locale, 'project', $pckgTransDir, $pckgName)) return;
             if ($this->loadNovaTranslations($locale, 'local', $pckgTransDir, $pckgName)) return;
             if ($this->loadNovaTranslations($fallbackLocale, 'project', $pckgTransDir, $pckgName)) return;
             if ($this->loadNovaTranslations($fallbackLocale, 'local', $pckgTransDir, $pckgName)) return;
             $this->loadNovaTranslations('en', 'local', $pckgTransDir, $pckgName);
-
-            // Load Laravel translations
-            $this->loadLaravelTranslations($pckgTransDir, $pckgName);
         });
     }