Lots of tiny message changes.
* Mostly punctuation updates so that the same message is used consistently in all of StatusNet. * Some cases of "Title Case" removed, because that does not appear to be used consistently.
This commit is contained in:
parent
26b0324027
commit
4af6b7f5c3
|
@ -153,7 +153,7 @@ class ApiDirectMessageAction extends ApiAuthAction
|
||||||
$this->showJsonDirectMessages();
|
$this->showJsonDirectMessages();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,7 +96,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
@ -116,7 +116,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
|
||||||
|
|
||||||
if ($this->user->hasFave($this->notice)) {
|
if ($this->user->hasFave($this->notice)) {
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('This status is already a favorite!'),
|
_('This status is already a favorite.'),
|
||||||
403,
|
403,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -97,7 +97,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
@ -119,7 +119,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
|
||||||
|
|
||||||
if (!$fave->find(true)) {
|
if (!$fave->find(true)) {
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('That status is not a favorite!'),
|
_('That status is not a favorite.'),
|
||||||
403,
|
403,
|
||||||
$this->favorite
|
$this->favorite
|
||||||
);
|
);
|
||||||
|
|
|
@ -97,7 +97,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -97,7 +97,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
@ -117,7 +117,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
|
||||||
|
|
||||||
if ($this->user->id == $this->other->id) {
|
if ($this->user->id == $this->other->id) {
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_("You cannot unfollow yourself!"),
|
_("You cannot unfollow yourself."),
|
||||||
403,
|
403,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -126,7 +126,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
|
||||||
parent::handle($args);
|
parent::handle($args);
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(_('API method not found!'), 404);
|
$this->clientError(_('API method not found.'), 404);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@ class ApiGroupCreateAction extends ApiAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -111,7 +111,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
400,
|
400,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -152,7 +152,7 @@ class ApiGroupJoinAction extends ApiAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -138,7 +138,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -129,7 +129,7 @@ class ApiGroupListAction extends ApiBareAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -117,7 +117,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -103,7 +103,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -102,7 +102,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
|
||||||
$this->showSingleJsonGroup($this->group);
|
$this->showSingleJsonGroup($this->group);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), 404, $this->format);
|
$this->clientError(_('API method not found.'), 404, $this->format);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ class ApiHelpTestAction extends ApiPrivateAuthAction
|
||||||
$this->endDocument('json');
|
$this->endDocument('json');
|
||||||
} else {
|
} else {
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -99,7 +99,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
|
||||||
parent::handle($args);
|
parent::handle($args);
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -109,7 +109,7 @@ class ApiStatusesRetweetsAction extends ApiAuthAction
|
||||||
$this->showJsonTimeline($strm);
|
$this->showJsonTimeline($strm);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,7 +105,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
|
||||||
parent::handle($args);
|
parent::handle($args);
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,7 @@ class ApiStatusnetConfigAction extends ApiAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -90,7 +90,7 @@ class ApiStatusnetVersionAction extends ApiPrivateAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -108,7 +108,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
|
||||||
parent::handle($args);
|
parent::handle($args);
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -143,7 +143,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
|
||||||
$this->showJsonTimeline($this->notices);
|
$this->showJsonTimeline($this->notices);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
|
||||||
$this->showJsonTimeline($this->notices);
|
$this->showJsonTimeline($this->notices);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,7 +147,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(
|
$this->clientError(
|
||||||
_('API method not found!'),
|
_('API method not found.'),
|
||||||
404,
|
404,
|
||||||
$this->format
|
$this->format
|
||||||
);
|
);
|
||||||
|
|
|
@ -153,7 +153,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
|
||||||
$this->showJsonTimeline($this->notices);
|
$this->showJsonTimeline($this->notices);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -148,7 +148,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
|
||||||
$this->showJsonTimeline($this->notices);
|
$this->showJsonTimeline($this->notices);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,7 +128,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
|
||||||
$this->showJsonTimeline($this->notices);
|
$this->showJsonTimeline($this->notices);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,7 +119,7 @@ class ApiTimelineRetweetedByMeAction extends ApiAuthAction
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,7 +118,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,7 +119,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,7 +138,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
|
||||||
$this->showJsonTimeline($this->notices);
|
$this->showJsonTimeline($this->notices);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -162,7 +162,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
|
||||||
$this->showJsonTimeline($this->notices);
|
$this->showJsonTimeline($this->notices);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!in_array($this->format, array('xml', 'json'))) {
|
if (!in_array($this->format, array('xml', 'json'))) {
|
||||||
$this->clientError(_('API method not found!'), $code = 404);
|
$this->clientError(_('API method not found.'), $code = 404);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -70,14 +70,14 @@ class BlockedfromgroupAction extends GroupDesignAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
if (!$nickname) {
|
||||||
$this->clientError(_('No nickname'), 404);
|
$this->clientError(_('No nickname.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$this->group = User_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ class DeletenoticeAction extends Action
|
||||||
|
|
||||||
if (!$token || $token != common_session_token()) {
|
if (!$token || $token != common_session_token()) {
|
||||||
$this->showForm(_('There was a problem with your session token. ' .
|
$this->showForm(_('There was a problem with your session token. ' .
|
||||||
' Try again, please.'));
|
'Try again, please.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ class EditgroupAction extends GroupDesignAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
if (!$nickname) {
|
||||||
$this->clientError(_('No nickname'), 404);
|
$this->clientError(_('No nickname.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,14 +93,14 @@ class EditgroupAction extends GroupDesignAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
|
||||||
if (!$cur->isAdmin($this->group)) {
|
if (!$cur->isAdmin($this->group)) {
|
||||||
$this->clientError(_('You must be an admin to edit the group'), 403);
|
$this->clientError(_('You must be an admin to edit the group.'), 403);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -165,7 +165,7 @@ class EditgroupAction extends GroupDesignAction
|
||||||
{
|
{
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
if (!$cur->isAdmin($this->group)) {
|
if (!$cur->isAdmin($this->group)) {
|
||||||
$this->clientError(_('You must be an admin to edit the group'), 403);
|
$this->clientError(_('You must be an admin to edit the group.'), 403);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ class EmailsettingsAction extends AccountSettingsAction
|
||||||
|
|
||||||
function title()
|
function title()
|
||||||
{
|
{
|
||||||
return _('Email Settings');
|
return _('Email settings');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -118,7 +118,7 @@ class EmailsettingsAction extends AccountSettingsAction
|
||||||
} else {
|
} else {
|
||||||
$this->elementStart('ul', 'form_data');
|
$this->elementStart('ul', 'form_data');
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
$this->input('email', _('Email Address'),
|
$this->input('email', _('Email address'),
|
||||||
($this->arg('email')) ? $this->arg('email') : null,
|
($this->arg('email')) ? $this->arg('email') : null,
|
||||||
_('Email address, like "UserName@example.org"'));
|
_('Email address, like "UserName@example.org"'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
|
@ -328,7 +328,7 @@ class EmailsettingsAction extends AccountSettingsAction
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!Validate::email($email, common_config('email', 'check_domain'))) {
|
if (!Validate::email($email, common_config('email', 'check_domain'))) {
|
||||||
$this->showForm(_('Not a valid email address'));
|
$this->showForm(_('Not a valid email address.'));
|
||||||
return;
|
return;
|
||||||
} else if ($user->email == $email) {
|
} else if ($user->email == $email) {
|
||||||
$this->showForm(_('That is already your email address.'));
|
$this->showForm(_('That is already your email address.'));
|
||||||
|
|
|
@ -71,7 +71,7 @@ class GroupbyidAction extends Action
|
||||||
$id = $this->arg('id');
|
$id = $this->arg('id');
|
||||||
|
|
||||||
if (!$id) {
|
if (!$id) {
|
||||||
$this->clientError(_('No ID'));
|
$this->clientError(_('No ID.'));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,7 +80,7 @@ class GroupbyidAction extends Action
|
||||||
$this->group = User_group::staticGet('id', $id);
|
$this->group = User_group::staticGet('id', $id);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
if (!$nickname) {
|
||||||
$this->clientError(_('No nickname'), 404);
|
$this->clientError(_('No nickname.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,14 +94,14 @@ class GroupDesignSettingsAction extends DesignSettingsAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
|
||||||
if (!$cur->isAdmin($this->group)) {
|
if (!$cur->isAdmin($this->group)) {
|
||||||
$this->clientError(_('You must be an admin to edit the group'), 403);
|
$this->clientError(_('You must be an admin to edit the group.'), 403);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -284,7 +284,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
|
||||||
|
|
||||||
if (empty($id)) {
|
if (empty($id)) {
|
||||||
common_log_db_error($id, 'INSERT', __FILE__);
|
common_log_db_error($id, 'INSERT', __FILE__);
|
||||||
$this->showForm(_('Unable to save your design settings!'));
|
$this->showForm(_('Unable to save your design settings.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -294,7 +294,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
|
||||||
|
|
||||||
if (empty($result)) {
|
if (empty($result)) {
|
||||||
common_log_db_error($original, 'UPDATE', __FILE__);
|
common_log_db_error($original, 'UPDATE', __FILE__);
|
||||||
$this->showForm(_('Unable to save your design settings!'));
|
$this->showForm(_('Unable to save your design settings.'));
|
||||||
$this->group->query('ROLLBACK');
|
$this->group->query('ROLLBACK');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,7 +83,7 @@ class GrouplogoAction extends GroupDesignAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
if (!$nickname) {
|
||||||
$this->clientError(_('No nickname'), 404);
|
$this->clientError(_('No nickname.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,14 +96,14 @@ class GrouplogoAction extends GroupDesignAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
|
||||||
if (!$cur->isAdmin($this->group)) {
|
if (!$cur->isAdmin($this->group)) {
|
||||||
$this->clientError(_('You must be an admin to edit the group'), 403);
|
$this->clientError(_('You must be an admin to edit the group.'), 403);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ class GrouplogoAction extends GroupDesignAction
|
||||||
|
|
||||||
if (!$profile) {
|
if (!$profile) {
|
||||||
common_log_db_error($user, 'SELECT', __FILE__);
|
common_log_db_error($user, 'SELECT', __FILE__);
|
||||||
$this->serverError(_('User without matching profile'));
|
$this->serverError(_('User without matching profile.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -73,14 +73,14 @@ class GroupmembersAction extends GroupDesignAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
if (!$nickname) {
|
||||||
$this->clientError(_('No nickname'), 404);
|
$this->clientError(_('No nickname.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$this->group = User_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ class ImsettingsAction extends ConnectSettingsAction
|
||||||
|
|
||||||
function title()
|
function title()
|
||||||
{
|
{
|
||||||
return _('IM Settings');
|
return _('IM settings');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -121,7 +121,7 @@ class ImsettingsAction extends ConnectSettingsAction
|
||||||
} else {
|
} else {
|
||||||
$this->elementStart('ul', 'form_data');
|
$this->elementStart('ul', 'form_data');
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
$this->input('jabber', _('IM Address'),
|
$this->input('jabber', _('IM address'),
|
||||||
($this->arg('jabber')) ? $this->arg('jabber') : null,
|
($this->arg('jabber')) ? $this->arg('jabber') : null,
|
||||||
sprintf(_('Jabber or GTalk address, '.
|
sprintf(_('Jabber or GTalk address, '.
|
||||||
'like "UserName@example.org". '.
|
'like "UserName@example.org". '.
|
||||||
|
|
|
@ -73,21 +73,21 @@ class JoingroupAction extends Action
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
if (!$nickname) {
|
||||||
$this->clientError(_('No nickname'), 404);
|
$this->clientError(_('No nickname.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->group = User_group::staticGet('nickname', $nickname);
|
$this->group = User_group::staticGet('nickname', $nickname);
|
||||||
|
|
||||||
if (!$this->group) {
|
if (!$this->group) {
|
||||||
$this->clientError(_('No such group'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
|
||||||
if ($cur->isMember($this->group)) {
|
if ($cur->isMember($this->group)) {
|
||||||
$this->clientError(_('You are already a member of that group'), 403);
|
$this->clientError(_('You are already a member of that group.'), 403);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ class JoingroupAction extends Action
|
||||||
|
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
common_log_db_error($member, 'INSERT', __FILE__);
|
common_log_db_error($member, 'INSERT', __FILE__);
|
||||||
$this->serverError(sprintf(_('Could not join user %1$s to group %2$s'),
|
$this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'),
|
||||||
$cur->nickname, $this->group->nickname));
|
$cur->nickname, $this->group->nickname));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@ class MakeadminAction extends Action
|
||||||
'profile_id' => $this->profile->id));
|
'profile_id' => $this->profile->id));
|
||||||
|
|
||||||
if (empty($member)) {
|
if (empty($member)) {
|
||||||
$this->serverError(_('Can\'t get membership record for %1$s in group %2$s'),
|
$this->serverError(_('Can\'t get membership record for %1$s in group %2$s.'),
|
||||||
$this->profile->getBestName(),
|
$this->profile->getBestName(),
|
||||||
$this->group->getBestName());
|
$this->group->getBestName());
|
||||||
}
|
}
|
||||||
|
@ -142,7 +142,7 @@ class MakeadminAction extends Action
|
||||||
|
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
common_log_db_error($member, 'UPDATE', __FILE__);
|
common_log_db_error($member, 'UPDATE', __FILE__);
|
||||||
$this->serverError(_('Can\'t make %1$s an admin for group %2$s'),
|
$this->serverError(_('Can\'t make %1$s an admin for group %2$s.'),
|
||||||
$this->profile->getBestName(),
|
$this->profile->getBestName(),
|
||||||
$this->group->getBestName());
|
$this->group->getBestName());
|
||||||
}
|
}
|
||||||
|
|
|
@ -182,7 +182,7 @@ class NewmessageAction extends Action
|
||||||
$this->elementEnd('head');
|
$this->elementEnd('head');
|
||||||
$this->elementStart('body');
|
$this->elementStart('body');
|
||||||
$this->element('p', array('id' => 'command_result'),
|
$this->element('p', array('id' => 'command_result'),
|
||||||
sprintf(_('Direct message to %s sent'),
|
sprintf(_('Direct message to %s sent.'),
|
||||||
$this->other->nickname));
|
$this->other->nickname));
|
||||||
$this->elementEnd('body');
|
$this->elementEnd('body');
|
||||||
$this->elementEnd('html');
|
$this->elementEnd('html');
|
||||||
|
|
|
@ -305,7 +305,7 @@ class PathsAdminPanelForm extends AdminForm
|
||||||
$this->unli();
|
$this->unli();
|
||||||
|
|
||||||
$this->li();
|
$this->li();
|
||||||
$this->input('sslserver', _('SSL Server'),
|
$this->input('sslserver', _('SSL server'),
|
||||||
_('Server to direct SSL requests to'), 'site');
|
_('Server to direct SSL requests to'), 'site');
|
||||||
$this->unli();
|
$this->unli();
|
||||||
$this->out->elementEnd('ul');
|
$this->out->elementEnd('ul');
|
||||||
|
|
|
@ -118,7 +118,7 @@ class ShowgroupAction extends GroupDesignAction
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$nickname) {
|
if (!$nickname) {
|
||||||
$this->clientError(_('No nickname'), 404);
|
$this->clientError(_('No nickname.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ class ShowgroupAction extends GroupDesignAction
|
||||||
common_redirect(common_local_url('groupbyid', $args), 301);
|
common_redirect(common_local_url('groupbyid', $args), 301);
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
$this->clientError(_('No such group'), 404);
|
$this->clientError(_('No such group.'), 404);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,10 +151,10 @@ class SiteadminpanelAction extends AdminPanelAction
|
||||||
$values['site']['email'] = common_canonical_email($values['site']['email']);
|
$values['site']['email'] = common_canonical_email($values['site']['email']);
|
||||||
|
|
||||||
if (empty($values['site']['email'])) {
|
if (empty($values['site']['email'])) {
|
||||||
$this->clientError(_('You must have a valid contact email address'));
|
$this->clientError(_('You must have a valid contact email address.'));
|
||||||
}
|
}
|
||||||
if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) {
|
if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) {
|
||||||
$this->clientError(_('Not a valid email address'));
|
$this->clientError(_('Not a valid email address.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate timezone
|
// Validate timezone
|
||||||
|
@ -169,7 +169,7 @@ class SiteadminpanelAction extends AdminPanelAction
|
||||||
|
|
||||||
if (!is_null($values['site']['language']) &&
|
if (!is_null($values['site']['language']) &&
|
||||||
!in_array($values['site']['language'], array_keys(get_nice_language_list()))) {
|
!in_array($values['site']['language'], array_keys(get_nice_language_list()))) {
|
||||||
$this->clientError(sprintf(_('Unknown language "%s"'), $values['site']['language']));
|
$this->clientError(sprintf(_('Unknown language "%s".'), $values['site']['language']));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate report URL
|
// Validate report URL
|
||||||
|
|
|
@ -55,7 +55,7 @@ class SmssettingsAction extends ConnectSettingsAction
|
||||||
|
|
||||||
function title()
|
function title()
|
||||||
{
|
{
|
||||||
return _('SMS Settings');
|
return _('SMS settings');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -135,7 +135,7 @@ class SmssettingsAction extends ConnectSettingsAction
|
||||||
} else {
|
} else {
|
||||||
$this->elementStart('ul', 'form_data');
|
$this->elementStart('ul', 'form_data');
|
||||||
$this->elementStart('li');
|
$this->elementStart('li');
|
||||||
$this->input('sms', _('SMS Phone number'),
|
$this->input('sms', _('SMS phone number'),
|
||||||
($this->arg('sms')) ? $this->arg('sms') : null,
|
($this->arg('sms')) ? $this->arg('sms') : null,
|
||||||
_('Phone number, no punctuation or spaces, '.
|
_('Phone number, no punctuation or spaces, '.
|
||||||
'with area code'));
|
'with area code'));
|
||||||
|
|
|
@ -163,8 +163,8 @@ class TagotherAction extends Action
|
||||||
$token = $this->trimmed('token');
|
$token = $this->trimmed('token');
|
||||||
|
|
||||||
if (!$token || $token != common_session_token()) {
|
if (!$token || $token != common_session_token()) {
|
||||||
$this->showForm(_('There was a problem with your session token.'.
|
$this->showForm(_('There was a problem with your session token. '.
|
||||||
' Try again, please.'));
|
'Try again, please.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ class UnsubscribeAction extends Action
|
||||||
$other = Profile::staticGet('id', $other_id);
|
$other = Profile::staticGet('id', $other_id);
|
||||||
|
|
||||||
if (!$other) {
|
if (!$other) {
|
||||||
$this->clientError(_('No profile with that id.'));
|
$this->clientError(_('No profile with that ID.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -207,7 +207,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||||
|
|
||||||
if (empty($id)) {
|
if (empty($id)) {
|
||||||
common_log_db_error($id, 'INSERT', __FILE__);
|
common_log_db_error($id, 'INSERT', __FILE__);
|
||||||
$this->showForm(_('Unable to save your design settings!'));
|
$this->showForm(_('Unable to save your design settings.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -217,7 +217,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||||
|
|
||||||
if (empty($result)) {
|
if (empty($result)) {
|
||||||
common_log_db_error($original, 'UPDATE', __FILE__);
|
common_log_db_error($original, 'UPDATE', __FILE__);
|
||||||
$this->showForm(_('Unable to save your design settings!'));
|
$this->showForm(_('Unable to save your design settings.'));
|
||||||
$user->query('ROLLBACK');
|
$user->query('ROLLBACK');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -260,7 +260,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||||
|
|
||||||
if (empty($id)) {
|
if (empty($id)) {
|
||||||
common_log_db_error($id, 'INSERT', __FILE__);
|
common_log_db_error($id, 'INSERT', __FILE__);
|
||||||
$this->showForm(_('Unable to save your design settings!'));
|
$this->showForm(_('Unable to save your design settings.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -270,7 +270,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||||
|
|
||||||
if (empty($result)) {
|
if (empty($result)) {
|
||||||
common_log_db_error($original, 'UPDATE', __FILE__);
|
common_log_db_error($original, 'UPDATE', __FILE__);
|
||||||
$this->showForm(_('Unable to save your design settings!'));
|
$this->showForm(_('Unable to save your design settings.'));
|
||||||
$user->query('ROLLBACK');
|
$user->query('ROLLBACK');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -315,7 +315,7 @@ class WhoisCommand extends Command
|
||||||
$whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
|
$whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
|
||||||
$recipient->profileurl);
|
$recipient->profileurl);
|
||||||
if ($recipient->fullname) {
|
if ($recipient->fullname) {
|
||||||
$whois .= "\n" . sprintf(_('Fullname: %s'), $recipient->fullname);
|
$whois .= "\n" . sprintf(_('Full name: %s'), $recipient->fullname);
|
||||||
}
|
}
|
||||||
if ($recipient->location) {
|
if ($recipient->location) {
|
||||||
$whois .= "\n" . sprintf(_('Location: %s'), $recipient->location);
|
$whois .= "\n" . sprintf(_('Location: %s'), $recipient->location);
|
||||||
|
|
|
@ -197,7 +197,7 @@ function _have_config()
|
||||||
// XXX: Find a way to use htmlwriter for this instead of handcoded markup
|
// XXX: Find a way to use htmlwriter for this instead of handcoded markup
|
||||||
if (!_have_config()) {
|
if (!_have_config()) {
|
||||||
echo '<p>'. _('No configuration file found. ') .'</p>';
|
echo '<p>'. _('No configuration file found. ') .'</p>';
|
||||||
echo '<p>'. _('I looked for configuration files in the following places: ') .'<br/> '. implode($_config_files, '<br/>');
|
echo '<p>'. _('I looked for configuration files in the following places: ') .'<br /> '. implode($_config_files, '<br />');
|
||||||
echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
|
echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
|
||||||
echo '<a href="install.php">'. _('Go to the installer.') .'</a>';
|
echo '<a href="install.php">'. _('Go to the installer.') .'</a>';
|
||||||
exit;
|
exit;
|
||||||
|
|
|
@ -251,11 +251,11 @@ function mail_subscribe_notify_profile($listenee, $other)
|
||||||
common_config('site', 'name'),
|
common_config('site', 'name'),
|
||||||
$other->profileurl,
|
$other->profileurl,
|
||||||
($other->location) ?
|
($other->location) ?
|
||||||
sprintf(_("Location: %s\n"), $other->location) : '',
|
sprintf(_("Location: %s"), $other->location) . "\n" : '',
|
||||||
($other->homepage) ?
|
($other->homepage) ?
|
||||||
sprintf(_("Homepage: %s\n"), $other->homepage) : '',
|
sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '',
|
||||||
($other->bio) ?
|
($other->bio) ?
|
||||||
sprintf(_("Bio: %s\n\n"), $other->bio) : '',
|
sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '',
|
||||||
common_config('site', 'name'),
|
common_config('site', 'name'),
|
||||||
common_local_url('emailsettings'));
|
common_local_url('emailsettings'));
|
||||||
|
|
||||||
|
@ -652,4 +652,3 @@ function mail_notify_attn($user, $notice)
|
||||||
common_init_locale();
|
common_init_locale();
|
||||||
mail_to_user($user, $subject, $body);
|
mail_to_user($user, $subject, $body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -176,7 +176,7 @@ class MediaFile
|
||||||
// Should never actually get here
|
// Should never actually get here
|
||||||
|
|
||||||
@unlink($_FILES[$param]['tmp_name']);
|
@unlink($_FILES[$param]['tmp_name']);
|
||||||
throw new ClientException(_('File exceeds user\'s quota!'));
|
throw new ClientException(_('File exceeds user\'s quota.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ class MediaFile
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
throw new ClientException(_('Could not determine file\'s mime-type!'));
|
throw new ClientException(_('Could not determine file\'s MIME type.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -213,7 +213,7 @@ class MediaFile
|
||||||
|
|
||||||
// Should never actually get here
|
// Should never actually get here
|
||||||
|
|
||||||
throw new ClientException(_('File exceeds user\'s quota!'));
|
throw new ClientException(_('File exceeds user\'s quota.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,7 +234,7 @@ class MediaFile
|
||||||
$stream['uri'] . ' ' . $filepath));
|
$stream['uri'] . ' ' . $filepath));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new ClientException(_('Could not determine file\'s mime-type!'));
|
throw new ClientException(_('Could not determine file\'s MIME type.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -272,7 +272,7 @@ class MediaFile
|
||||||
$hint = '';
|
$hint = '';
|
||||||
}
|
}
|
||||||
throw new ClientException(sprintf(
|
throw new ClientException(sprintf(
|
||||||
_('%s is not a supported filetype on this server.'), $filetype) . $hint);
|
_('%s is not a supported file type on this server.'), $filetype) . $hint);
|
||||||
}
|
}
|
||||||
|
|
||||||
static function respectsQuota($user, $filesize)
|
static function respectsQuota($user, $filesize)
|
||||||
|
|
|
@ -123,7 +123,7 @@ class SubscriptionListItem extends ProfileListItem
|
||||||
}
|
}
|
||||||
$this->out->elementEnd('ul');
|
$this->out->elementEnd('ul');
|
||||||
} else {
|
} else {
|
||||||
$this->out->text(_('(none)'));
|
$this->out->text(_('(None)'));
|
||||||
}
|
}
|
||||||
$this->out->elementEnd('dd');
|
$this->out->elementEnd('dd');
|
||||||
$this->out->elementEnd('dl');
|
$this->out->elementEnd('dl');
|
||||||
|
|
|
@ -298,7 +298,7 @@ class XMPPDaemon extends Daemon
|
||||||
$content_shortened = common_shorten_links($body);
|
$content_shortened = common_shorten_links($body);
|
||||||
if (Notice::contentTooLong($content_shortened)) {
|
if (Notice::contentTooLong($content_shortened)) {
|
||||||
$from = jabber_normalize_jid($pl['from']);
|
$from = jabber_normalize_jid($pl['from']);
|
||||||
$this->from_site($from, sprintf(_("Message too long - maximum is %d characters, you sent %d"),
|
$this->from_site($from, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
|
||||||
Notice::maxContent(),
|
Notice::maxContent(),
|
||||||
mb_strlen($content_shortened)));
|
mb_strlen($content_shortened)));
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user