diff --git a/app/Containers/Article/UI/WEB/Transformers/PostItemResource.php b/app/Containers/Article/UI/WEB/Transformers/PostItemResource.php index f7ec139..268a99c 100644 --- a/app/Containers/Article/UI/WEB/Transformers/PostItemResource.php +++ b/app/Containers/Article/UI/WEB/Transformers/PostItemResource.php @@ -26,7 +26,13 @@ class PostItemResource extends JsonResource 'authors' => $this->authors, 'gallery' => $this->images, 'reading_time' => $this->reading_time, - 'created_post' => Carbon::parse($this->publish_at)->diffforhumans(), + 'created_post' => Carbon::parse($this->publish_at) + ->locale('ru') + ->translatedFormat( + Carbon::parse($this->publish_at)->isCurrentYear() + ? 'd M' + : 'd M Y' . ' г.' + ) ]; } } diff --git a/app/Containers/Article/UI/WEB/Transformers/PostListResource.php b/app/Containers/Article/UI/WEB/Transformers/PostListResource.php index d645ec6..09782fb 100644 --- a/app/Containers/Article/UI/WEB/Transformers/PostListResource.php +++ b/app/Containers/Article/UI/WEB/Transformers/PostListResource.php @@ -25,7 +25,13 @@ class PostListResource extends JsonResource 'authors' => $this->authors, 'preview' => $this->preview, 'reading_time' => $this->reading_time, - 'created_post' => Carbon::parse($this->publish_at)->diffforhumans(), + 'created_post' => Carbon::parse($this->publish_at) + ->locale('ru') + ->translatedFormat( + Carbon::parse($this->publish_at)->isCurrentYear() + ? 'd M' + : 'd M Y' + ) ]; } } diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index c241e47..5923e8b 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -26,10 +26,6 @@ class HandleInertiaRequests extends Middleware 'auth' => [ 'user' => $request->user() ? $request->user()->only('id', 'name', 'email', 'created_at') : null, ], -// 'ziggy' => fn () => [ -// ...(new Ziggy)->toArray(), -// 'location' => $request->url(), -// ], 'ziggy' => function() { return array_merge((new Ziggy())->toArray(), [ 'location' => url()->current(),