Skip to content

add new branch - main #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
"name": "dedermus",
"email": "[email protected]"
}
],
"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"
]
}
}
Expand Down
5 changes: 3 additions & 2 deletions routes/web.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?php

use KevinSoft\MultiLanguage\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)) {
Expand Down
7 changes: 4 additions & 3 deletions src/Http/Controllers/MultiLanguageController.php
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions src/Middlewares/MultiLanguageMiddleware.php
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
6 changes: 3 additions & 3 deletions src/MultiLanguage.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace KevinSoft\MultiLanguage;
namespace OpenAdminCore\Admin\MultiLanguage;

use Encore\Admin\Extension;
use OpenAdminCore\Admin\Extension;

class MultiLanguage extends Extension
{
Expand All @@ -11,4 +11,4 @@ class MultiLanguage extends Extension
public $views = __DIR__.'/../resources/views';

public $assets = __DIR__.'/../resources/assets';
}
}
8 changes: 4 additions & 4 deletions src/MultiLanguageServiceProvider.php
Original file line number Diff line number Diff line change
@@ -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
{
Expand All @@ -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'
);
}
Expand Down
7 changes: 2 additions & 5 deletions src/Widgets/LanguageMenu.php
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down