From 06533e15e6fa661737e10de66d01bc2b6e9f4560 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Fri, 26 Aug 2022 11:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/WelcomeController.php          | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/beike/Installer/Controllers/WelcomeController.php b/beike/Installer/Controllers/WelcomeController.php
index e00e8b76..407d6eac 100644
--- a/beike/Installer/Controllers/WelcomeController.php
+++ b/beike/Installer/Controllers/WelcomeController.php
@@ -18,28 +18,26 @@ use Illuminate\Support\Facades\Session;
 
 class WelcomeController extends Controller
 {
+    private $languages = [
+        'zh_cn' => '简体中文',
+        'en' => 'English',
+    ];
+
+
     public function index()
     {
         if (installed()) {
             exit('Already installed');
         }
 
-        $languageDir = base_path('beike/Installer/Lang');
-        $packages = array_values(array_diff(scandir($languageDir), array('..', '.')));
-        $Languages = collect($packages)->filter(function ($package) {
-            return file_exists(base_path("beike/Installer/Lang/{$package}"));
-        })->toArray();
-        $data['languages'] = array_values($Languages);
-        $data['steps'] = 1;
+        $data['languages'] = $this->languages;
 
         return view('installer::welcome', $data);
     }
 
     public function locale($lang)
     {
-        $languageDir = base_path('beike/Installer/Lang');
-        $packages = array_values(array_diff(scandir($languageDir), array('..', '.')));
-        if (in_array($lang, $packages)) {
+        if (in_array($lang, languages()->toArray())) {
             Session::put('locale', $lang);
         }
         return Redirect::back();