Commit a2e4a180 authored by Siebrand Mazeland's avatar Siebrand Mazeland

Harmonize message for 'User has no profile.' and update translator documentation.

parent 14389414
...@@ -107,7 +107,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction ...@@ -107,7 +107,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
$profile = $this->user->getProfile(); $profile = $this->user->getProfile();
if (empty($profile)) { 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.')); $this->clientError(_('User has no profile.'));
return; return;
} }
......
...@@ -195,7 +195,7 @@ class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction ...@@ -195,7 +195,7 @@ class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction
$profile = $this->user->getProfile(); $profile = $this->user->getProfile();
if (empty($profile)) { 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.')); $this->clientError(_('User has no profile.'));
return; return;
} }
......
...@@ -179,7 +179,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction ...@@ -179,7 +179,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction
$profile = $this->user->getProfile(); $profile = $this->user->getProfile();
if (empty($profile)) { 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.')); $this->clientError(_('User has no profile.'));
return; return;
} }
......
...@@ -127,7 +127,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction ...@@ -127,7 +127,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction
$profile = $this->user->getProfile(); $profile = $this->user->getProfile();
if (empty($profile)) { 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.')); $this->clientError(_('User has no profile.'));
return; return;
} }
......
...@@ -84,7 +84,7 @@ class ApiUserProfileImageAction extends ApiPrivateAuthAction ...@@ -84,7 +84,7 @@ class ApiUserProfileImageAction extends ApiPrivateAuthAction
$profile = $this->user->getProfile(); $profile = $this->user->getProfile();
if (empty($profile)) { 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.')); $this->clientError(_('User has no profile.'));
return; return;
} }
......
...@@ -104,7 +104,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction ...@@ -104,7 +104,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction
$profile = $this->user->getProfile(); $profile = $this->user->getProfile();
if (empty($profile)) { 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.')); $this->clientError(_('User has no profile.'));
return; return;
} }
......
...@@ -81,7 +81,7 @@ class AvatarbynicknameAction extends Action ...@@ -81,7 +81,7 @@ class AvatarbynicknameAction extends Action
} }
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) { 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.')); $this->clientError(_('User has no profile.'));
return; return;
} }
......
...@@ -104,8 +104,8 @@ class AvatarsettingsAction extends SettingsAction ...@@ -104,8 +104,8 @@ class AvatarsettingsAction extends SettingsAction
if (!$profile) { if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__); 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. // TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User without matching profile.')); $this->serverError(_('User has no profile.'));
return; return;
} }
...@@ -190,8 +190,8 @@ class AvatarsettingsAction extends SettingsAction ...@@ -190,8 +190,8 @@ class AvatarsettingsAction extends SettingsAction
if (!$profile) { if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__); 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. // TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User without matching profile.')); $this->serverError(_('User has no profile.'));
return; return;
} }
......
...@@ -65,7 +65,7 @@ class FoafAction extends Action ...@@ -65,7 +65,7 @@ class FoafAction extends Action
$this->profile = $this->user->getProfile(); $this->profile = $this->user->getProfile();
if (!$this->profile) { 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); $this->serverError(_('User has no profile.'), 500);
return false; return false;
} }
......
...@@ -180,8 +180,8 @@ class GrouplogoAction extends GroupDesignAction ...@@ -180,8 +180,8 @@ class GrouplogoAction extends GroupDesignAction
if (!$profile) { if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__); common_log_db_error($user, 'SELECT', __FILE__);
// TRANS: Server error displayed coming across a request from a user without a profile. // TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User without matching profile.')); $this->serverError(_('User has no profile.'));
return; return;
} }
......
...@@ -71,7 +71,7 @@ class HcardAction extends Action ...@@ -71,7 +71,7 @@ class HcardAction extends Action
$this->profile = $this->user->getProfile(); $this->profile = $this->user->getProfile();
if (!$this->profile) { 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.')); $this->serverError(_('User has no profile.'));
return false; return false;
} }
......
...@@ -101,7 +101,7 @@ class PeopletagsbyuserAction extends OwnerDesignAction ...@@ -101,7 +101,7 @@ class PeopletagsbyuserAction extends OwnerDesignAction
$this->tagger = $this->user->getProfile(); $this->tagger = $this->user->getProfile();
if (!$this->tagger) { 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.')); $this->serverError(_('User has no profile.'));
return false; return false;
} }
......
...@@ -83,7 +83,7 @@ class PeopletagsforuserAction extends OwnerDesignAction ...@@ -83,7 +83,7 @@ class PeopletagsforuserAction extends OwnerDesignAction
$this->tagged = $this->user->getProfile(); $this->tagged = $this->user->getProfile();
if (!$this->tagged) { 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.')); $this->serverError(_('User has no profile.'));
return false; return false;
} }
......
...@@ -85,7 +85,7 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction ...@@ -85,7 +85,7 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
$this->profile = $user->getProfile(); $this->profile = $user->getProfile();
if (!$this->profile) { 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.')); $this->serverError(_('User has no profile.'));
return false; return false;
} }
......
...@@ -205,8 +205,8 @@ class RemotesubscribeAction extends Action ...@@ -205,8 +205,8 @@ class RemotesubscribeAction extends Action
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) { if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__); common_log_db_error($user, 'SELECT', __FILE__);
// TRANS: Server error displayed on page for remote subscribe when user does not have a matching profile. // TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User without matching profile.')); $this->serverError(_('User has no profile.'));
return; return;
} }
......
...@@ -76,7 +76,7 @@ class RepliesAction extends OwnerDesignAction ...@@ -76,7 +76,7 @@ class RepliesAction extends OwnerDesignAction
$profile = $this->user->getProfile(); $profile = $this->user->getProfile();
if (!$profile) { 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.')); $this->serverError(_('User has no profile.'));
return false; return false;
} }
......
...@@ -71,9 +71,8 @@ class UserauthorizationAction extends Action ...@@ -71,9 +71,8 @@ class UserauthorizationAction extends Action
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) { if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__); common_log_db_error($user, 'SELECT', __FILE__);
// TRANS: Server error displayed when trying to authorise a remote subscription request // TRANS: Error message displayed when referring to a user without a profile.
// TRANS: while the user has no profile. $this->serverError(_('User has no profile.'));
$this->serverError(_('User without matching profile.'));
return; return;
} }
......
...@@ -99,7 +99,7 @@ class UsergroupsAction extends ProfileAction ...@@ -99,7 +99,7 @@ class UsergroupsAction extends ProfileAction
$this->profile = $this->user->getProfile(); $this->profile = $this->user->getProfile();
if (!$this->profile) { 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.')); $this->serverError(_('User has no profile.'));
return false; return false;
} }
......
...@@ -106,8 +106,8 @@ class UserrssAction extends Rss10Action ...@@ -106,8 +106,8 @@ class UserrssAction extends Rss10Action
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) { if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__); common_log_db_error($user, 'SELECT', __FILE__);
// TRANS: Server error displayed in user RSS when user does not have a matching profile. // TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_('User without matching profile.')); $this->serverError(_('User has no profile.'));
return null; return null;
} }
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
......
...@@ -65,7 +65,7 @@ class GalleryAction extends ProfileAction ...@@ -65,7 +65,7 @@ class GalleryAction extends ProfileAction
$this->profile = $this->user->getProfile(); $this->profile = $this->user->getProfile();
if (!$this->profile) { 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.')); $this->serverError(_('User has no profile.'));
return false; return false;
} }
......
...@@ -81,7 +81,7 @@ class ProfileAction extends OwnerDesignAction ...@@ -81,7 +81,7 @@ class ProfileAction extends OwnerDesignAction
$this->profile = $this->user->getProfile(); $this->profile = $this->user->getProfile();
if (!$this->profile) { 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.')); $this->serverError(_('User has no profile.'));
return false; return false;
} }
......
...@@ -46,6 +46,7 @@ class LogFilterPlugin extends Plugin ...@@ -46,6 +46,7 @@ class LogFilterPlugin extends Plugin
'author' => 'Brion Vibber', 'author' => 'Brion Vibber',
'homepage' => 'http://status.net/wiki/Plugin:LogFilter', 'homepage' => 'http://status.net/wiki/Plugin:LogFilter',
'rawdescription' => 'rawdescription' =>
// TRANS: Plugin description.
_m('Provides server-side setting to filter log output by type or keyword.')); _m('Provides server-side setting to filter log output by type or keyword.'));
return true; return true;
......
...@@ -69,6 +69,7 @@ class MapAction extends OwnerDesignAction ...@@ -69,6 +69,7 @@ class MapAction extends OwnerDesignAction
$this->user = User::staticGet('nickname', $nickname); $this->user = User::staticGet('nickname', $nickname);
if (!$this->user) { if (!$this->user) {
// TRANS: Client error displayed when referring to a non-existing user.
$this->clientError(_m('No such user.'), 404); $this->clientError(_m('No such user.'), 404);
return false; return false;
} }
...@@ -76,6 +77,7 @@ class MapAction extends OwnerDesignAction ...@@ -76,6 +77,7 @@ class MapAction extends OwnerDesignAction
$this->profile = $this->user->getProfile(); $this->profile = $this->user->getProfile();
if (!$this->profile) { if (!$this->profile) {
// TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_m('User has no profile.')); $this->serverError(_m('User has no profile.'));
return false; return false;
} }
......
...@@ -15,6 +15,7 @@ class RemoteProfileAction extends ShowstreamAction ...@@ -15,6 +15,7 @@ class RemoteProfileAction extends ShowstreamAction
$this->profile = Profile::staticGet('id', $id); $this->profile = Profile::staticGet('id', $id);
if (!$this->profile) { if (!$this->profile) {
// TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_m('User has no profile.')); $this->serverError(_m('User has no profile.'));
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment