Skip to content

Commit

Permalink
hot fix for ru localization
Browse files Browse the repository at this point in the history
  • Loading branch information
lee-to committed Sep 22, 2022
1 parent 703ded6 commit 8b77e89
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion lang/en/ui.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
'email' => 'E-mail',
'password' => 'Password',
],
'base_resource' => [
'resource' => [
'role' => 'Role',
'name' => 'Name',
'email' => 'E-mail',
Expand Down
25 changes: 12 additions & 13 deletions src/Resources/MoonShineUserResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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(),
];
Expand All @@ -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'),
];
}

Expand Down
6 changes: 3 additions & 3 deletions src/Resources/MoonShineUserRoleResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
];
}
Expand All @@ -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'),
];
}

Expand Down

0 comments on commit 8b77e89

Please sign in to comment.