Merge pull request #1694 from larvatecn/2.0

src/AdminServiceProvider.php

@@ -169,11 +169,7 @@ class AdminServiceProvider extends ServiceProvider
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([__DIR__.'/../config' => config_path()], 'dcat-admin-config');
-            if (version_compare($this->app->version(), '9.0.0', '>=')) {
-                $this->publishes([__DIR__.'/../resources/lang' => base_path('lang')], 'dcat-admin-lang');
-            } else {
-                $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'dcat-admin-lang');
-            }
+            $this->publishes([__DIR__.'/../resources/lang' => $this->app->langPath()], 'dcat-admin-lang');
             $this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')], 'dcat-admin-migrations');
             $this->publishes([__DIR__.'/../resources/dist' => public_path(Admin::asset()->getRealPath('@admin'))], 'dcat-admin-assets');
         }

tests/Feature/InstallTest.php

@@ -31,14 +31,8 @@ class InstallTest extends TestCase
         $this->assertFileExists(config_path('admin.php'));
         $this->assertFileExists(public_path(Admin::asset()->getRealPath('@admin')));
         $this->assertFileExists(database_path('migrations/2016_01_04_173148_create_admin_tables.php'));
-        if (version_compare(app()->version(), '9.0.0', '>=')) {
-            $this->assertFileExists(base_path('lang/en/admin.php'));
-            $this->assertFileExists(base_path('lang/zh_CN/admin.php'));
-            $this->assertFileExists(base_path('lang/zh_CN/global.php'));
-        } else {
-            $this->assertFileExists(resource_path('lang/en/admin.php'));
-            $this->assertFileExists(resource_path('lang/zh_CN/admin.php'));
-            $this->assertFileExists(resource_path('lang/zh_CN/global.php'));
-        }
+        $this->assertFileExists(app()->langPath().'/en/admin.php');
+        $this->assertFileExists(app()->langPath().'/zh_CN/admin.php');
+        $this->assertFileExists(app()->langPath().'/zh_CN/global.php');
     }
 }