修改Admin::jsVariable()使其可以自定义前端lang翻译 (#1834)

jqhph · Jul 15, 2022 · 4805138 · 4805138
1 parent 7138b52
commit 4805138
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Admin.php b/src/Admin.php
@@ -540,9 +540,14 @@ public static function jsVariables(array $variables = null)
 
         $pjaxId = static::getPjaxContainerId();
 
+        $lang = __('admin.client') ?: [];
+        if (isset($jsVariables['lang'])) {
+            $lang = array_merge($lang, $jsVariables['lang']);
+        }
+
         $jsVariables['pjax_container_selector'] = $pjaxId ? ('#'.$pjaxId) : '';
         $jsVariables['token'] = csrf_token();
-        $jsVariables['lang'] = __('admin.client') ?: [];
+        $jsVariables['lang'] = $lang;
         $jsVariables['colors'] = static::color()->all();
         $jsVariables['dark_mode'] = static::isDarkMode();
         $jsVariables['sidebar_dark'] = config('admin.layout.sidebar_dark') || ($sidebarStyle === 'dark');