From a2e4a1803c2fef25ffc94d306781cec4ae18a5b5 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 25 Apr 2011 14:48:19 +0200 Subject: [PATCH] Harmonize message for 'User has no profile.' and update translator documentation. --- actions/apiaccountupdateprofile.php | 2 +- actions/apiaccountupdateprofilebackgroundimage.php | 2 +- actions/apiaccountupdateprofilecolors.php | 2 +- actions/apiaccountupdateprofileimage.php | 2 +- actions/apiuserprofileimage.php | 2 +- actions/apiusershow.php | 2 +- actions/avatarbynickname.php | 2 +- actions/avatarsettings.php | 8 ++++---- actions/foaf.php | 2 +- actions/grouplogo.php | 4 ++-- actions/hcard.php | 2 +- actions/peopletagsbyuser.php | 2 +- actions/peopletagsforuser.php | 2 +- actions/peopletagsubscriptions.php | 2 +- actions/remotesubscribe.php | 4 ++-- actions/replies.php | 2 +- actions/userauthorization.php | 5 ++--- actions/usergroups.php | 2 +- actions/userrss.php | 4 ++-- lib/galleryaction.php | 2 +- lib/profileaction.php | 2 +- plugins/LogFilter/LogFilterPlugin.php | 1 + plugins/Mapstraction/map.php | 2 ++ plugins/ModPlus/remoteprofileaction.php | 1 + 24 files changed, 32 insertions(+), 29 deletions(-) diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php index a572131f18..15b13c0f20 100644 --- a/actions/apiaccountupdateprofile.php +++ b/actions/apiaccountupdateprofile.php @@ -107,7 +107,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { - // TRANS: Client error displayed if a user profile could not be found. + // TRANS: Error message displayed when referring to a user without a profile. $this->clientError(_('User has no profile.')); return; } diff --git a/actions/apiaccountupdateprofilebackgroundimage.php b/actions/apiaccountupdateprofilebackgroundimage.php index 36eaa6c411..bb0cef52a4 100644 --- a/actions/apiaccountupdateprofilebackgroundimage.php +++ b/actions/apiaccountupdateprofilebackgroundimage.php @@ -195,7 +195,7 @@ class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { - // TRANS: Client error displayed when a user has no profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->clientError(_('User has no profile.')); return; } diff --git a/actions/apiaccountupdateprofilecolors.php b/actions/apiaccountupdateprofilecolors.php index 621b05b0d9..4fa85c6877 100644 --- a/actions/apiaccountupdateprofilecolors.php +++ b/actions/apiaccountupdateprofilecolors.php @@ -179,7 +179,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { - // TRANS: Client error displayed a user has no profile updating profile colours. + // TRANS: Error message displayed when referring to a user without a profile. $this->clientError(_('User has no profile.')); return; } diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php index 986a8f3f1e..3bf064ea89 100644 --- a/actions/apiaccountupdateprofileimage.php +++ b/actions/apiaccountupdateprofileimage.php @@ -127,7 +127,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { - // TRANS: Client error displayed if a user profile could not be found updating a profile image. + // TRANS: Error message displayed when referring to a user without a profile. $this->clientError(_('User has no profile.')); return; } diff --git a/actions/apiuserprofileimage.php b/actions/apiuserprofileimage.php index d2cf9a3e57..2d26e5c4ea 100644 --- a/actions/apiuserprofileimage.php +++ b/actions/apiuserprofileimage.php @@ -84,7 +84,7 @@ class ApiUserProfileImageAction extends ApiPrivateAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { - // TRANS: Client error displayed when requesting user information for a user without a profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->clientError(_('User has no profile.')); return; } diff --git a/actions/apiusershow.php b/actions/apiusershow.php index ab1bfb9c9c..11638954db 100644 --- a/actions/apiusershow.php +++ b/actions/apiusershow.php @@ -104,7 +104,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction $profile = $this->user->getProfile(); if (empty($profile)) { - // TRANS: Client error displayed when requesting user information for a user without a profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->clientError(_('User has no profile.')); return; } diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php index fa97a86ebf..a581d5ae35 100644 --- a/actions/avatarbynickname.php +++ b/actions/avatarbynickname.php @@ -81,7 +81,7 @@ class AvatarbynicknameAction extends Action } $profile = $user->getProfile(); if (!$profile) { - // TRANS: Client error displayed trying to get an avatar for a user without a profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->clientError(_('User has no profile.')); return; } diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index ceab14a962..9ac7115e93 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -104,8 +104,8 @@ class AvatarsettingsAction extends SettingsAction if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - // TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user. - $this->serverError(_('User without matching profile.')); + // TRANS: Error message displayed when referring to a user without a profile. + $this->serverError(_('User has no profile.')); return; } @@ -190,8 +190,8 @@ class AvatarsettingsAction extends SettingsAction if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - // TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user. - $this->serverError(_('User without matching profile.')); + // TRANS: Error message displayed when referring to a user without a profile. + $this->serverError(_('User has no profile.')); return; } diff --git a/actions/foaf.php b/actions/foaf.php index ceb575c736..fa6efde6e4 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -65,7 +65,7 @@ class FoafAction extends Action $this->profile = $this->user->getProfile(); if (!$this->profile) { - // TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.'), 500); return false; } diff --git a/actions/grouplogo.php b/actions/grouplogo.php index db0d40ff0c..a6694cd837 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -180,8 +180,8 @@ class GrouplogoAction extends GroupDesignAction if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - // TRANS: Server error displayed coming across a request from a user without a profile. - $this->serverError(_('User without matching profile.')); + // TRANS: Error message displayed when referring to a user without a profile. + $this->serverError(_('User has no profile.')); return; } diff --git a/actions/hcard.php b/actions/hcard.php index 8781f6f882..6db2972b9d 100644 --- a/actions/hcard.php +++ b/actions/hcard.php @@ -71,7 +71,7 @@ class HcardAction extends Action $this->profile = $this->user->getProfile(); if (!$this->profile) { - // TRANS: Server error displayed when trying to get a user hCard for a user without a profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.')); return false; } diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php index 62c956ff93..d348585c90 100644 --- a/actions/peopletagsbyuser.php +++ b/actions/peopletagsbyuser.php @@ -101,7 +101,7 @@ class PeopletagsbyuserAction extends OwnerDesignAction $this->tagger = $this->user->getProfile(); if (!$this->tagger) { - // TRANS: Server error displayed when a user has no profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.')); return false; } diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php index 6496bb0906..9883bd3657 100644 --- a/actions/peopletagsforuser.php +++ b/actions/peopletagsforuser.php @@ -83,7 +83,7 @@ class PeopletagsforuserAction extends OwnerDesignAction $this->tagged = $this->user->getProfile(); if (!$this->tagged) { - // TRANS: Server error displayed when a user has no profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.')); return false; } diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php index c421353703..b65542e074 100644 --- a/actions/peopletagsubscriptions.php +++ b/actions/peopletagsubscriptions.php @@ -85,7 +85,7 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction $this->profile = $user->getProfile(); if (!$this->profile) { - // TRANS: Server error displayed when a user has no profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.')); return false; } diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 5514b9a98c..16945122f4 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -205,8 +205,8 @@ class RemotesubscribeAction extends Action $profile = $user->getProfile(); if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - // TRANS: Server error displayed on page for remote subscribe when user does not have a matching profile. - $this->serverError(_('User without matching profile.')); + // TRANS: Error message displayed when referring to a user without a profile. + $this->serverError(_('User has no profile.')); return; } diff --git a/actions/replies.php b/actions/replies.php index 54109b7b9f..7ae2d0eb76 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -76,7 +76,7 @@ class RepliesAction extends OwnerDesignAction $profile = $this->user->getProfile(); if (!$profile) { - // TRANS: Server error displayed when trying to reply to a user without a profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.')); return false; } diff --git a/actions/userauthorization.php b/actions/userauthorization.php index fd01cd7c02..0cb55715f9 100644 --- a/actions/userauthorization.php +++ b/actions/userauthorization.php @@ -71,9 +71,8 @@ class UserauthorizationAction extends Action $profile = $user->getProfile(); if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - // TRANS: Server error displayed when trying to authorise a remote subscription request - // TRANS: while the user has no profile. - $this->serverError(_('User without matching profile.')); + // TRANS: Error message displayed when referring to a user without a profile. + $this->serverError(_('User has no profile.')); return; } diff --git a/actions/usergroups.php b/actions/usergroups.php index ca95abddf5..178a3586fd 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -99,7 +99,7 @@ class UsergroupsAction extends ProfileAction $this->profile = $this->user->getProfile(); if (!$this->profile) { - // TRANS: Server error displayed requesting groups for a user without a profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.')); return false; } diff --git a/actions/userrss.php b/actions/userrss.php index b60cc5e0c7..85ea2fd7fa 100644 --- a/actions/userrss.php +++ b/actions/userrss.php @@ -106,8 +106,8 @@ class UserrssAction extends Rss10Action $profile = $user->getProfile(); if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - // TRANS: Server error displayed in user RSS when user does not have a matching profile. - $this->serverError(_('User without matching profile.')); + // TRANS: Error message displayed when referring to a user without a profile. + $this->serverError(_('User has no profile.')); return null; } $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); diff --git a/lib/galleryaction.php b/lib/galleryaction.php index bd7da195fa..51bb9e3e1a 100644 --- a/lib/galleryaction.php +++ b/lib/galleryaction.php @@ -65,7 +65,7 @@ class GalleryAction extends ProfileAction $this->profile = $this->user->getProfile(); if (!$this->profile) { - // TRANS: Server error displayed when trying to perform a gallery action with a user without a profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.')); return false; } diff --git a/lib/profileaction.php b/lib/profileaction.php index bdd7f9144d..09ebcc5de0 100644 --- a/lib/profileaction.php +++ b/lib/profileaction.php @@ -81,7 +81,7 @@ class ProfileAction extends OwnerDesignAction $this->profile = $this->user->getProfile(); if (!$this->profile) { - // TRANS: Server error displayed when calling a profile action while the specified user does not have a profile. + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_('User has no profile.')); return false; } diff --git a/plugins/LogFilter/LogFilterPlugin.php b/plugins/LogFilter/LogFilterPlugin.php index e2153e959c..4f3a45dcdc 100644 --- a/plugins/LogFilter/LogFilterPlugin.php +++ b/plugins/LogFilter/LogFilterPlugin.php @@ -46,6 +46,7 @@ class LogFilterPlugin extends Plugin 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:LogFilter', 'rawdescription' => + // TRANS: Plugin description. _m('Provides server-side setting to filter log output by type or keyword.')); return true; diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php index dbba4edd0c..2ccf1642d7 100644 --- a/plugins/Mapstraction/map.php +++ b/plugins/Mapstraction/map.php @@ -69,6 +69,7 @@ class MapAction extends OwnerDesignAction $this->user = User::staticGet('nickname', $nickname); if (!$this->user) { + // TRANS: Client error displayed when referring to a non-existing user. $this->clientError(_m('No such user.'), 404); return false; } @@ -76,6 +77,7 @@ class MapAction extends OwnerDesignAction $this->profile = $this->user->getProfile(); if (!$this->profile) { + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_m('User has no profile.')); return false; } diff --git a/plugins/ModPlus/remoteprofileaction.php b/plugins/ModPlus/remoteprofileaction.php index 4822fc4248..4399c4813c 100644 --- a/plugins/ModPlus/remoteprofileaction.php +++ b/plugins/ModPlus/remoteprofileaction.php @@ -15,6 +15,7 @@ class RemoteProfileAction extends ShowstreamAction $this->profile = Profile::staticGet('id', $id); if (!$this->profile) { + // TRANS: Error message displayed when referring to a user without a profile. $this->serverError(_m('User has no profile.')); return false; }