From 8b77e89ccf60eabfcd97a370d1f8d241b5f833b2 Mon Sep 17 00:00:00 2001 From: LT Date: Thu, 22 Sep 2022 18:31:31 +0300 Subject: [PATCH] hot fix for ru localization --- lang/en/ui.php | 2 +- src/Resources/MoonShineUserResource.php | 25 ++++++++++----------- src/Resources/MoonShineUserRoleResource.php | 6 ++--- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lang/en/ui.php b/lang/en/ui.php index 4feb39170..29501d50e 100644 --- a/lang/en/ui.php +++ b/lang/en/ui.php @@ -39,7 +39,7 @@ 'email' => 'E-mail', 'password' => 'Password', ], - 'base_resource' => [ + 'resource' => [ 'role' => 'Role', 'name' => 'Name', 'email' => 'E-mail', diff --git a/src/Resources/MoonShineUserResource.php b/src/Resources/MoonShineUserResource.php index 16e3ffa35..9496a8bec 100644 --- a/src/Resources/MoonShineUserResource.php +++ b/src/Resources/MoonShineUserResource.php @@ -6,15 +6,14 @@ use Leeto\MoonShine\Actions\ExportAction; use Leeto\MoonShine\Fields\BelongsTo; +use Leeto\MoonShine\Fields\Date; use Leeto\MoonShine\Fields\Email; use Leeto\MoonShine\Fields\ID; -use Leeto\MoonShine\Fields\PasswordRepeat; -use Leeto\MoonShine\Fields\Text; use Leeto\MoonShine\Fields\Image; -use Leeto\MoonShine\Fields\Date; use Leeto\MoonShine\Fields\Password; +use Leeto\MoonShine\Fields\PasswordRepeat; +use Leeto\MoonShine\Fields\Text; use Leeto\MoonShine\Filters\TextFilter; - use Leeto\MoonShine\Models\MoonshineUser; class MoonShineUserResource extends Resource @@ -27,7 +26,7 @@ class MoonShineUserResource extends Resource public function title(): string { - return trans('moonshine::ui.base_resource.admins_title'); + return trans('moonshine::ui.resource.admins_title'); } public function fields(): array @@ -38,40 +37,40 @@ public function fields(): array ->showOnExport(), BelongsTo::make( - trans('moonshine::ui.base_resource.role'), + trans('moonshine::ui.resource.role'), 'moonshine_user_role_id', new MoonShineUserRoleResource() ) ->showOnExport(), - Text::make(trans('moonshine::ui.base_resource.name'), 'name') + Text::make(trans('moonshine::ui.resource.name'), 'name') ->required() ->showOnExport(), - Image::make(trans('moonshine::ui.base_resource.avatar'), 'avatar') + Image::make(trans('moonshine::ui.resource.avatar'), 'avatar') ->removable() ->showOnExport() ->disk(config('filesystems.default')) ->dir('moonshine_users') ->allowedExtensions(['jpg', 'png', 'jpeg', 'gif']), - Date::make(trans('moonshine::ui.base_resource.created_at'), 'created_at') + Date::make(trans('moonshine::ui.resource.created_at'), 'created_at') ->format("d.m.Y") ->default(now()->toDateTimeString()) ->sortable() ->hideOnForm() ->showOnExport(), - Email::make(trans('moonshine::ui.base_resource.email'), 'email') + Email::make(trans('moonshine::ui.resource.email'), 'email') ->sortable() ->showOnExport() ->required(), - Password::make(trans('moonshine::ui.base_resource.password'), 'password') + Password::make(trans('moonshine::ui.resource.password'), 'password') ->customAttributes(['autocomplete' => 'new-password']) ->hideOnIndex(), - PasswordRepeat::make(trans('moonshine::ui.base_resource.repeat_password'), 'password_repeat') + PasswordRepeat::make(trans('moonshine::ui.resource.repeat_password'), 'password_repeat') ->customAttributes(['autocomplete' => 'confirm-password']) ->hideOnIndex(), ]; @@ -97,7 +96,7 @@ public function search(): array public function filters(): array { return [ - TextFilter::make(trans('moonshine::ui.base_resource.name'), 'name'), + TextFilter::make(trans('moonshine::ui.resource.name'), 'name'), ]; } diff --git a/src/Resources/MoonShineUserRoleResource.php b/src/Resources/MoonShineUserRoleResource.php index 038504ad3..e32308875 100644 --- a/src/Resources/MoonShineUserRoleResource.php +++ b/src/Resources/MoonShineUserRoleResource.php @@ -19,14 +19,14 @@ class MoonShineUserRoleResource extends Resource public function title(): string { - return trans('moonshine::ui.base_resource.role'); + return trans('moonshine::ui.resource.role'); } public function fields(): array { return [ ID::make()->sortable()->showOnExport(), - Text::make(trans('moonshine::ui.base_resource.role_name'), 'name') + Text::make(trans('moonshine::ui.resource.role_name'), 'name') ->required()->showOnExport(), ]; } @@ -46,7 +46,7 @@ public function search(): array public function filters(): array { return [ - TextFilter::make(trans('moonshine::ui.base_resource.role_name'), 'name'), + TextFilter::make(trans('moonshine::ui.resource.role_name'), 'name'), ]; }