From 3fb483889910c5cc754cbc4f6dffbf2b8a4df584 Mon Sep 17 00:00:00 2001
From: dedermus <mapple@inbox.ru>
Date: Sat, 23 Nov 2024 21:39:11 +0300
Subject: [PATCH 1/2] add new branch - main

---
 composer.json  | 20 ++++++++++----------
 routes/web.php |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 1066416..bd96771 100644
--- a/composer.json
+++ b/composer.json
@@ -1,32 +1,32 @@
 {
-    "name": "laravel-admin-extensions/multi-language",
-    "description": "适用于laravel-admin的多语言支持扩展",
+    "name": "dedermus/multi-language",
+    "description": "Expanding multilingual support for Laravel open-admin-core",
     "type": "library",
-    "keywords": ["laravel-admin", "extension"],
-    "homepage": "https://github.com/laravel-admin-extensions/multi-language",
+    "keywords": ["open-admin-core", "multi-language"],
+    "homepage": "https://github.com/dedermus/multi-language",
     "license": "MIT",
     "authors": [
         {
-            "name": "wangxk",
-            "email": "wangxkww@foxmail.com"
+            "name": "dedermus",
+            "email": "dedermus@yandex.ru"
         }
     ],
     "require": {
-        "php": ">=7.0.0",
-        "encore/laravel-admin": "~1.6"
+        "php": "^8.2",
+        "dedermus/open-admin-core": "^v2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "psr-4": {
-            "KevinSoft\\MultiLanguage\\": "src/"
+            "OpenAdminCore\\Admin\\MultiLanguage\\": "src/"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "KevinSoft\\MultiLanguage\\MultiLanguageServiceProvider"
+                "OpenAdminCore\\Admin\\MultiLanguage\\MultiLanguageServiceProvider"
             ]
         }
     }
diff --git a/routes/web.php b/routes/web.php
index 5368df0..2e18074 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,6 @@
 <?php
 
-use KevinSoft\MultiLanguage\Http\Controllers\MultiLanguageController;
+use OpenAdminCore\Admin\LockScreen\Http\Controllers\MultiLanguageController;
 use KevinSoft\MultiLanguage\MultiLanguage;
 
 Route::post('/locale', MultiLanguageController::class.'@locale');

From 17c28ebbebb5aa6b1aae448f012d2f7434bfa7ec Mon Sep 17 00:00:00 2001
From: dedermus <mapple@inbox.ru>
Date: Sat, 23 Nov 2024 22:08:49 +0300
Subject: [PATCH 2/2] edit LanguageMenu.php MultiLanguage.php
 MultiLanguageController.php MultiLanguageMiddleware.php
 MultiLanguageServiceProvider.php web.php

---
 routes/web.php                                   | 5 +++--
 src/Http/Controllers/MultiLanguageController.php | 7 ++++---
 src/Middlewares/MultiLanguageMiddleware.php      | 6 +++---
 src/MultiLanguage.php                            | 6 +++---
 src/MultiLanguageServiceProvider.php             | 8 ++++----
 src/Widgets/LanguageMenu.php                     | 7 ++-----
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 2e18074..52fb73e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,8 @@
 <?php
 
-use OpenAdminCore\Admin\LockScreen\Http\Controllers\MultiLanguageController;
-use KevinSoft\MultiLanguage\MultiLanguage;
+use Illuminate\Support\Facades\Route;
+use OpenAdminCore\Admin\MultiLanguage\Http\Controllers\MultiLanguageController;
+use OpenAdminCore\Admin\MultiLanguage\MultiLanguage;
 
 Route::post('/locale', MultiLanguageController::class.'@locale');
 if(MultiLanguage::config("show-login-page", true)) {
diff --git a/src/Http/Controllers/MultiLanguageController.php b/src/Http/Controllers/MultiLanguageController.php
index cf69c39..dd737d6 100644
--- a/src/Http/Controllers/MultiLanguageController.php
+++ b/src/Http/Controllers/MultiLanguageController.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace KevinSoft\MultiLanguage\Http\Controllers;
+namespace OpenAdminCore\Admin\MultiLanguage\Http\Controllers;
+use OpenAdminCore\Admin\Layout\Content;
 
-use Encore\Admin\Layout\Content;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\Request;
-use KevinSoft\MultiLanguage\MultiLanguage;
+use OpenAdminCore\Admin\MultiLanguage\MultiLanguage;
+
 
 class MultiLanguageController extends Controller
 {
diff --git a/src/Middlewares/MultiLanguageMiddleware.php b/src/Middlewares/MultiLanguageMiddleware.php
index b5294f3..f6d2439 100644
--- a/src/Middlewares/MultiLanguageMiddleware.php
+++ b/src/Middlewares/MultiLanguageMiddleware.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace KevinSoft\MultiLanguage\Middlewares;
+namespace OpenAdminCore\Admin\MultiLanguage\Middlewares;
 
 use Closure;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cookie;
-use KevinSoft\MultiLanguage\MultiLanguage;
+use OpenAdminCore\Admin\MultiLanguage\MultiLanguage;
 
 class MultiLanguageMiddleware
 {
     public function handle($request, Closure $next)
     {
         config(['admin.auth.excepts' => ['auth/login','locale']]);
-        
+
         $languages = MultiLanguage::config('languages');
         $cookie_name = MultiLanguage::config('cookie-name', 'locale');
 
diff --git a/src/MultiLanguage.php b/src/MultiLanguage.php
index f36bdc4..e77162f 100644
--- a/src/MultiLanguage.php
+++ b/src/MultiLanguage.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace KevinSoft\MultiLanguage;
+namespace OpenAdminCore\Admin\MultiLanguage;
 
-use Encore\Admin\Extension;
+use OpenAdminCore\Admin\Extension;
 
 class MultiLanguage extends Extension
 {
@@ -11,4 +11,4 @@ class MultiLanguage extends Extension
     public $views = __DIR__.'/../resources/views';
 
     public $assets = __DIR__.'/../resources/assets';
-}
\ No newline at end of file
+}
diff --git a/src/MultiLanguageServiceProvider.php b/src/MultiLanguageServiceProvider.php
index 105242a..1abff3c 100644
--- a/src/MultiLanguageServiceProvider.php
+++ b/src/MultiLanguageServiceProvider.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace KevinSoft\MultiLanguage;
+namespace OpenAdminCore\Admin\MultiLanguage;
 
-use Encore\Admin\Facades\Admin;
+use OpenAdminCore\Admin\Facades\Admin;
 use Illuminate\Support\ServiceProvider;
-use KevinSoft\MultiLanguage\Widgets\LanguageMenu;
+use OpenAdminCore\Admin\MultiLanguage\Widgets\LanguageMenu;
 
 class MultiLanguageServiceProvider extends ServiceProvider
 {
@@ -23,7 +23,7 @@ public function boot(MultiLanguage $extension)
 
         if ($this->app->runningInConsole() && $assets = $extension->assets()) {
             $this->publishes(
-                [$assets => public_path('vendor/kevinsoft/multi-language')],
+                [$assets => public_path('vendor/dedermus/multi-language')],
                 'multi-language'
             );
         }
diff --git a/src/Widgets/LanguageMenu.php b/src/Widgets/LanguageMenu.php
index c18419c..21f0a46 100644
--- a/src/Widgets/LanguageMenu.php
+++ b/src/Widgets/LanguageMenu.php
@@ -1,13 +1,10 @@
 <?php
 
-
-namespace KevinSoft\MultiLanguage\Widgets;
-
+namespace OpenAdminCore\Admin\MultiLanguage\Widgets;
 
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Facades\Cookie;
-use Illuminate\Support\Facades\Log;
-use KevinSoft\MultiLanguage\MultiLanguage;
+use OpenAdminCore\Admin\MultiLanguage\MultiLanguage;
 
 class LanguageMenu implements Renderable
 {