From 81017e18cb8741612be365f8a68b109f2b23aaee Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Sat, 23 Nov 2013 10:39:41 +0100 Subject: [PATCH] Logging: improved grammar a little --- src/Controllers/PostController.php | 6 +++--- src/Controllers/UserController.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php index 7361418c..c30c4dba 100644 --- a/src/Controllers/PostController.php +++ b/src/Controllers/PostController.php @@ -604,7 +604,7 @@ class PostController $newSafety = $post->safety; if ($oldSafety != $newSafety) - LogHelper::log('{user} changed safety for {post} to {safety}', ['post' => TextHelper::reprPost($post), 'safety' => PostSafety::toString($post->safety)]); + LogHelper::log('{user} changed safety of {post} to {safety}', ['post' => TextHelper::reprPost($post), 'safety' => PostSafety::toString($post->safety)]); } /* tags */ @@ -637,7 +637,7 @@ class PostController $newSource = $post->source; if ($oldSource != $newSource) - LogHelper::log('{user} changed source for {post} to {source}', ['post' => TextHelper::reprPost($post), 'source' => $post->source]); + LogHelper::log('{user} changed source of {post} to {source}', ['post' => TextHelper::reprPost($post), 'source' => $post->source]); } /* relations */ @@ -670,7 +670,7 @@ class PostController $srcPath = $suppliedFile['tmp_name']; $post->setCustomThumbnailFromPath($srcPath); - LogHelper::log('{user} changed thumb for {post}', ['post' => TextHelper::reprPost($post)]); + LogHelper::log('{user} changed thumb of {post}', ['post' => TextHelper::reprPost($post)]); } } } diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php index 2253a62e..a4c36954 100644 --- a/src/Controllers/UserController.php +++ b/src/Controllers/UserController.php @@ -226,7 +226,7 @@ class UserController { $user->staff_confirmed = true; Model_User::save($user); - LogHelper::log('{user} confirmed account for {subject}', ['subject' => TextHelper::reprUser($user)]); + LogHelper::log('{user} confirmed {subject}\'s account', ['subject' => TextHelper::reprUser($user)]); StatusHelper::success(); } } @@ -264,7 +264,7 @@ class UserController AuthController::doLogOut(); \Chibi\UrlHelper::forward(\Chibi\UrlHelper::route('index', 'index')); - LogHelper::log('{user} removed account for {subject}', ['subject' => TextHelper::reprUser($name)]); + LogHelper::log('{user} removed {subject}\'s account', ['subject' => TextHelper::reprUser($name)]); StatusHelper::success(); } } @@ -347,7 +347,7 @@ class UserController throw new SimpleException('Specified passwords must be the same'); $suppliedPassword = Model_User::validatePassword($suppliedPassword1); $user->pass_hash = Model_User::hashPassword($suppliedPassword, $user->pass_salt); - LogHelper::log('{user} changed password for {subject}', ['subject' => TextHelper::reprUser($user)]); + LogHelper::log('{user} changed {subject}\'s password', ['subject' => TextHelper::reprUser($user)]); } if ($suppliedEmail != '' and $suppliedEmail != $user->email_confirmed) @@ -365,7 +365,7 @@ class UserController { $user->email_unconfirmed = null; $user->email_confirmed = $suppliedEmail; - LogHelper::log('{user} changed e-mail for {subject} to {mail}', ['subject' => TextHelper::reprUser($user), 'mail' => $suppliedEmail]); + LogHelper::log('{user} changed {subject}\'s e-mail to {mail}', ['subject' => TextHelper::reprUser($user), 'mail' => $suppliedEmail]); } } @@ -374,7 +374,7 @@ class UserController PrivilegesHelper::confirmWithException(Privilege::ChangeUserAccessRank, PrivilegesHelper::getIdentitySubPrivilege($user)); $suppliedAccessRank = Model_User::validateAccessRank($suppliedAccessRank); $user->access_rank = $suppliedAccessRank; - LogHelper::log('{user} changed access rank for {subject} to {rank}', ['subject' => TextHelper::reprUser($user), 'rank' => AccessRank::toString($suppliedAccessRank)]); + LogHelper::log('{user} changed {subject}\'s access rank to {rank}', ['subject' => TextHelper::reprUser($user), 'rank' => AccessRank::toString($suppliedAccessRank)]); } if ($this->context->user->id == $user->id)