Browse Source

支持Laravel6

jqh 5 years ago
parent
commit
7c45bf4c9e
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/Grid/Tools/QuickSearch.php
  2. 2 2
      src/Support/helpers.php

+ 1 - 1
src/Grid/Tools/QuickSearch.php

@@ -3,7 +3,7 @@
 namespace Dcat\Admin\Grid\Tools;
 
 use Dcat\Admin\Admin;
-use Dcat\Admin\Grid\Concerns\QuickSearch as QuickSearchConcerns;
+use Dcat\Admin\Grid\Concerns\HasQuickSearch as QuickSearchConcerns;
 use Illuminate\Support\Arr;
 
 class QuickSearch extends AbstractTool

+ 2 - 2
src/Support/helpers.php

@@ -156,7 +156,7 @@ if (!function_exists('admin_trans')) {
         $translator = app('translator');
 
         if ($translator->has($key)) {
-            return $translator->trans($key, $replace, $locale);
+            return $translator->get($key, $replace, $locale);
         }
         if (
             strpos($key, 'global.') !== 0
@@ -170,7 +170,7 @@ if (!function_exists('admin_trans')) {
                 return end($arr);
             }
 
-            return $translator->trans($key, $replace, $locale);
+            return $translator->get($key, $replace, $locale);
         }
 
         return last(explode('.', $key));