diff --git a/app/Api/v1/Resources/UserManagerResource.php b/app/Api/v1/Resources/UserManagerResource.php index a51bbcd3..bc7799cf 100644 --- a/app/Api/v1/Resources/UserManagerResource.php +++ b/app/Api/v1/Resources/UserManagerResource.php @@ -90,9 +90,8 @@ public function toArray($request) parent::toArray($request), [ 'twofaccounts_count' => is_null($this->twofaccounts_count) ? 0 : $this->twofaccounts_count, - 'last_seen_at' => Carbon::parse($this->last_seen_at)->toDateString(), - 'created_at' => Carbon::parse($this->created_at)->toDateString(), - 'updated_at' => Carbon::parse($this->updated_at)->toDateString(), + 'last_seen_at' => Carbon::parse($this->last_seen_at)->locale(App::getLocale())->diffForHumans(), + 'created_at' => Carbon::parse($this->created_at)->locale(App::getLocale())->diffForHumans(), ] ); } diff --git a/resources/js/views/admin/users/Manage.vue b/resources/js/views/admin/users/Manage.vue index aea0f88e..1d4011b6 100644 --- a/resources/js/views/admin/users/Manage.vue +++ b/resources/js/views/admin/users/Manage.vue @@ -281,9 +281,8 @@

{{ $t('admin.logs') }}

diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php index 7748e707..36a1f60b 100644 --- a/resources/lang/en/admin.php +++ b/resources/lang/en/admin.php @@ -39,9 +39,9 @@ 'user_management' => 'User management', 'oauth_provider' => 'OAuth provider', 'account_bound_to_x_via_oauth' => 'This account is bound to a :provider account via OAuth', - 'last_seen_on_date' => 'Last seen at :date', - 'registered_on_date' => 'Registered on :date', - 'updated_on_date' => 'Updated on :date', + 'last_seen_on_date' => 'Last seen :date', + 'registered_on_date' => 'Registered :date', + 'updated_on_date' => 'Updated :date', 'access' => 'Access', 'password_requested_on_t' => 'A password reset request exists for this user (request sent at :datetime) meaning the user didn\'t change its password yet but the link he received is still valid. This could be a request from the user himself or from an administrator.', 'password_request_expired' => 'A password reset request exists for this user but has expired, meaning the user didn\'t change its password in time. This could be a request from the user himself or from an administrator.',