From 745e35ac1fcee01298db09a8649f79f410138652 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 13 Dec 2009 18:55:17 +0100
Subject: [PATCH] (Puctuation) consistency in clientError() calls.
---
actions/apistatusesretweet.php | 6 +++---
actions/apistatusesretweets.php | 2 +-
actions/file.php | 8 ++++----
actions/grouprss.php | 4 ++--
actions/tagother.php | 4 ++--
actions/userbyid.php | 9 ++++-----
lib/profileformaction.php | 4 ++--
plugins/OpenID/openidserver.php | 2 +-
plugins/TemplatePlugin.php | 2 +-
9 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php
index fc71d22743..85de79d5c8 100644
--- a/actions/apistatusesretweet.php
+++ b/actions/apistatusesretweet.php
@@ -72,7 +72,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
$this->original = Notice::staticGet('id', $id);
if (empty($this->original)) {
- $this->clientError(_('No such notice'),
+ $this->clientError(_('No such notice.'),
400, $this->format);
return false;
}
@@ -80,7 +80,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
$this->user = $this->auth_user;
if ($this->user->id == $notice->profile_id) {
- $this->clientError(_('Cannot repeat your own notice'));
+ $this->clientError(_('Cannot repeat your own notice.'));
400, $this->format);
return false;
}
@@ -88,7 +88,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
$profile = $this->user->getProfile();
if ($profile->hasRepeated($id)) {
- $this->clientError(_('Already repeated that notice'),
+ $this->clientError(_('Already repeated that notice.'),
400, $this->format);
return false;
}
diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php
index c54a374e28..2efd59b37f 100644
--- a/actions/apistatusesretweets.php
+++ b/actions/apistatusesretweets.php
@@ -69,7 +69,7 @@ class ApiStatusesRetweetsAction extends ApiAuthAction
$this->original = Notice::staticGet('id', $id);
if (empty($this->original)) {
- $this->clientError(_('No such notice'),
+ $this->clientError(_('No such notice.'),
400, $this->format);
return false;
}
diff --git a/actions/file.php b/actions/file.php
index 10c59a9612..c6f7b998a2 100644
--- a/actions/file.php
+++ b/actions/file.php
@@ -31,15 +31,15 @@ class FileAction extends Action
parent::prepare($args);
$this->id = $this->trimmed('notice');
if (empty($this->id)) {
- $this->clientError(_('No notice id'));
+ $this->clientError(_('No notice ID.'));
}
$notice = Notice::staticGet('id', $this->id);
if (empty($notice)) {
- $this->clientError(_('No notice'));
+ $this->clientError(_('No notice.'));
}
$atts = $notice->attachments();
if (empty($atts)) {
- $this->clientError(_('No attachments'));
+ $this->clientError(_('No attachments.'));
}
foreach ($atts as $att) {
if (!empty($att->filename)) {
@@ -48,7 +48,7 @@ class FileAction extends Action
}
}
if (empty($this->filerec)) {
- $this->clientError(_('No uploaded attachments'));
+ $this->clientError(_('No uploaded attachments.'));
}
return true;
}
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 50e48a67e9..866fc66eb1 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -88,14 +88,14 @@ class groupRssAction extends Rss10Action
}
if (!$nickname) {
- $this->clientError(_('No nickname'), 404);
+ $this->clientError(_('No nickname.'), 404);
return false;
}
$this->group = User_group::staticGet('nickname', $nickname);
if (!$this->group) {
- $this->clientError(_('No such group'), 404);
+ $this->clientError(_('No such group.'), 404);
return false;
}
diff --git a/actions/tagother.php b/actions/tagother.php
index c3f43be8ba..e9e13b939b 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -30,13 +30,13 @@ class TagotherAction extends Action
{
parent::prepare($args);
if (!common_logged_in()) {
- $this->clientError(_('Not logged in'), 403);
+ $this->clientError(_('Not logged in.'), 403);
return false;
}
$id = $this->trimmed('id');
if (!$id) {
- $this->clientError(_('No id argument.'));
+ $this->clientError(_('No ID argument.'));
return false;
}
diff --git a/actions/userbyid.php b/actions/userbyid.php
index ebff7e4a72..f3e1556f3f 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -47,17 +47,17 @@ class UserbyidAction extends Action
{
/**
* Is read only?
- *
+ *
* @return boolean true
*/
function isReadOnly($args)
- {
+ {
return true;
}
/**
* Class handler.
- *
+ *
* @param array $args array of arguments
*
* @return nothing
@@ -67,7 +67,7 @@ class UserbyidAction extends Action
parent::handle($args);
$id = $this->trimmed('id');
if (!$id) {
- $this->clientError(_('No id.'));
+ $this->clientError(_('No ID.'));
}
$user = User::staticGet($id);
if (!$user) {
@@ -88,4 +88,3 @@ class UserbyidAction extends Action
common_redirect($url, 303);
}
}
-
diff --git a/lib/profileformaction.php b/lib/profileformaction.php
index 8cb5f6a932..8a934666e3 100644
--- a/lib/profileformaction.php
+++ b/lib/profileformaction.php
@@ -120,7 +120,7 @@ class ProfileFormAction extends Action
if ($action) {
common_redirect(common_local_url($action, $args), 303);
} else {
- $this->clientError(_("No return-to arguments"));
+ $this->clientError(_("No return-to arguments."));
}
}
@@ -134,6 +134,6 @@ class ProfileFormAction extends Action
function handlePost()
{
- $this->serverError(_("unimplemented method"));
+ $this->serverError(_("Unimplemented method."));
}
}
diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php
index 181cbdf45e..afbca553f5 100644
--- a/plugins/OpenID/openidserver.php
+++ b/plugins/OpenID/openidserver.php
@@ -103,7 +103,7 @@ class OpenidserverAction extends Action
$response = $this->generateDenyResponse($request);
} else {
//invalid
- $this->clientError(sprintf(_m('You are not authorized to use the identity %s'),$request->identity),$code=403);
+ $this->clientError(sprintf(_m('You are not authorized to use the identity %s.'),$request->identity),$code=403);
}
} else {
$response = $this->oserver->handleRequest($request);
diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php
index 5f3ad81f52..18aa8034ca 100644
--- a/plugins/TemplatePlugin.php
+++ b/plugins/TemplatePlugin.php
@@ -300,7 +300,7 @@ class TemplateAction extends Action
// verify that user is admin
if (!($user->id == 1))
- $this->clientError(_('only User #1 can update the template'), $code = 401);
+ $this->clientError(_('Only User #1 can update the template.'), $code = 401);
// open the old template
$tpl_file = $this->templateFolder() . '/index.html';
--
2.39.5