Merge pull request #5546 from laradocs/master

jxlwqq · web-flow · commit 5b2e19cdedab · 2022-03-22T16:29:49.000+08:00
laravel9 发布语言文件
diff --git a/src/AdminServiceProvider.php b/src/AdminServiceProvider.php
@@ -115,7 +115,11 @@ protected function registerPublishing()
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([__DIR__.'/../config' => config_path()], 'laravel-admin-config');
-            $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'laravel-admin-lang');
+            if (version_compare($this->app->version(), '9.0.0', '>=')) {
+                $this->publishes([__DIR__.'/../resources/lang' => base_path('lang')], 'laravel-admin-lang');
+            } else {
+                $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'laravel-admin-lang');
+            }
             $this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')], 'laravel-admin-migrations');
             $this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-admin')], 'laravel-admin-assets');
         }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,11 @@ protected function registerPublishing()`
`115`	`115`	`{`
`116`	`116`	`if ($this->app->runningInConsole()) {`
`117`	`117`	`$this->publishes([__DIR__.'/../config' => config_path()], 'laravel-admin-config');`
`118`		`- $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'laravel-admin-lang');`
	`118`	`+ if (version_compare($this->app->version(), '9.0.0', '>=')) {`
	`119`	`+ $this->publishes([__DIR__.'/../resources/lang' => base_path('lang')], 'laravel-admin-lang');`
	`120`	`+ } else {`
	`121`	`+ $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'laravel-admin-lang');`
	`122`	`+ }`
`119`	`123`	`$this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')], 'laravel-admin-migrations');`
`120`	`124`	`$this->publishes([__DIR__.'/../resources/assets' => public_path('vendor/laravel-admin')], 'laravel-admin-assets');`
`121`	`125`	`}`