Remove mcamara/laravel-localization it doesnt work with laravel 11 (yet)
All checks were successful
Create Docker Image / Test Application (x86_64) (push) Successful in 30s
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 1m20s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 3m26s
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s

This commit is contained in:
Deon George 2025-01-12 16:21:36 +11:00
parent d838e07072
commit 9d97bb0f96
4 changed files with 20 additions and 99 deletions

View File

@ -11,8 +11,7 @@
"directorytree/ldaprecord-laravel": "^3.0", "directorytree/ldaprecord-laravel": "^3.0",
"laravel/framework": "^11.9", "laravel/framework": "^11.9",
"laravel/sanctum": "^4.0", "laravel/sanctum": "^4.0",
"laravel/ui": "^4.5", "laravel/ui": "^4.5"
"mcamara/laravel-localization": "^2.0"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.6", "barryvdh/laravel-debugbar": "^3.6",

78
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "02daf17113d0dcc1f5386ed7ce10f97c", "content-hash": "c513b2b51a8ad7dfe055c7861c9d6b2a",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",
@ -2209,82 +2209,6 @@
], ],
"time": "2024-12-08T08:18:47+00:00" "time": "2024-12-08T08:18:47+00:00"
}, },
{
"name": "mcamara/laravel-localization",
"version": "v2.2.1",
"source": {
"type": "git",
"url": "https://github.com/mcamara/laravel-localization.git",
"reference": "a19ddcc634dff6b06ae35ecb7f06b2a0444e9807"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/a19ddcc634dff6b06ae35ecb7f06b2a0444e9807",
"reference": "a19ddcc634dff6b06ae35ecb7f06b2a0444e9807",
"shasum": ""
},
"require": {
"laravel/framework": "^10.0|^11.0",
"php": "^8.2"
},
"require-dev": {
"orchestra/testbench-browser-kit": "^8.5|^9.0",
"phpunit/phpunit": "^10.1"
},
"suggest": {
"ext-intl": "*"
},
"type": "library",
"extra": {
"laravel": {
"aliases": {
"LaravelLocalization": "Mcamara\\LaravelLocalization\\Facades\\LaravelLocalization"
},
"providers": [
"Mcamara\\LaravelLocalization\\LaravelLocalizationServiceProvider"
]
}
},
"autoload": {
"psr-0": {
"Mcamara\\LaravelLocalization": "src/"
},
"classmap": []
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Marc Cámara",
"email": "mcamara88@gmail.com",
"role": "Developer"
}
],
"description": "Easy localization for Laravel",
"homepage": "https://github.com/mcamara/laravel-localization",
"keywords": [
"laravel",
"localization",
"php"
],
"support": {
"issues": "https://github.com/mcamara/laravel-localization/issues",
"source": "https://github.com/mcamara/laravel-localization/tree/v2.2.1"
},
"funding": [
{
"url": "https://github.com/iwasherefirst2",
"type": "github"
},
{
"url": "https://github.com/mcamara",
"type": "github"
}
],
"time": "2024-11-27T21:06:34+00:00"
},
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "3.8.1", "version": "3.8.1",

View File

@ -35,17 +35,17 @@
<li class="app-sidebar__heading">{{ $server ?? __('Server Name') }}</li> <li class="app-sidebar__heading">{{ $server ?? __('Server Name') }}</li>
<li> <li>
<div class="font-icon-wrapper float-start me-1 server-icon"> <div class="font-icon-wrapper float-start me-1 server-icon">
<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('info') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-info"></i></a> <a class="p-0 m-0" href="{{ url('info') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-info"></i></a>
</div> </div>
<div class="font-icon-wrapper float-start ms-1 me-1 server-icon"> <div class="font-icon-wrapper float-start ms-1 me-1 server-icon">
<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('schema') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-fingerprint"></i></a> <a class="p-0 m-0" href="{{ url('schema') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-fingerprint"></i></a>
</div> </div>
<div class="font-icon-wrapper float-start ms-1 me-1 server-icon"> <div class="font-icon-wrapper float-start ms-1 me-1 server-icon">
<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('import') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-upload"></i></a> <a class="p-0 m-0" href="{{ url('import') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-upload"></i></a>
</div> </div>
@env(['local']) @env(['local'])
<div class="font-icon-wrapper float-end ms-1 server-icon"> <div class="font-icon-wrapper float-end ms-1 server-icon">
<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('debug') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-toolbox"></i></a> <a class="p-0 m-0" href="{{ url('debug') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-toolbox"></i></a>
</div> </div>
@endenv @endenv
<div class="clearfix"></div> <div class="clearfix"></div>

View File

@ -16,23 +16,21 @@ use App\Http\Controllers\Auth\LoginController;
| |
*/ */
Route::group(['prefix' => LaravelLocalization::setLocale()], function() { Auth::routes([
Auth::routes([
'login' => TRUE, 'login' => TRUE,
'logout' => TRUE, 'logout' => TRUE,
'reset' => FALSE, 'reset' => FALSE,
'confirm' => FALSE, 'confirm' => FALSE,
'verify' => FALSE, 'verify' => FALSE,
'register' => FALSE, 'register' => FALSE,
]); ]);
Route::get('/',[HomeController::class,'home']); Route::get('/',[HomeController::class,'home']);
Route::get('info',[HomeController::class,'info']); Route::get('info',[HomeController::class,'info']);
Route::post('dn',[HomeController::class,'dn_frame']); Route::post('dn',[HomeController::class,'dn_frame']);
Route::get('debug',[HomeController::class,'debug']); Route::get('debug',[HomeController::class,'debug']);
Route::get('import',[HomeController::class,'import_frame']); Route::get('import',[HomeController::class,'import_frame']);
Route::get('schema',[HomeController::class,'schema_frame']); Route::get('schema',[HomeController::class,'schema_frame']);
});
Route::get('logout',[LoginController::class,'logout']); Route::get('logout',[LoginController::class,'logout']);