diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index 5b3f412adc..5fbc46518b 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -153,7 +153,7 @@ class ApiDirectMessageAction extends ApiAuthAction
$this->showJsonDirectMessages();
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index 4367397707..3618f94018 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -96,7 +96,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
if (!in_array($this->format, array('xml', 'json'))) {
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
@@ -116,7 +116,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
if ($this->user->hasFave($this->notice)) {
$this->clientError(
- _('This status is already a favorite!'),
+ _('This status is already a favorite.'),
403,
$this->format
);
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index f131d1c7f2..c4daf480e6 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -97,7 +97,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
if (!in_array($this->format, array('xml', 'json'))) {
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
@@ -119,7 +119,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
if (!$fave->find(true)) {
$this->clientError(
- _('That status is not a favorite!'),
+ _('That status is not a favorite.'),
403,
$this->favorite
);
diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index a824e734bf..1de2cc32e0 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -97,7 +97,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
if (!in_array($this->format, array('xml', 'json'))) {
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index 3d9b7e001c..91c6fd0324 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -97,7 +97,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
if (!in_array($this->format, array('xml', 'json'))) {
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
@@ -117,7 +117,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
if ($this->user->id == $this->other->id) {
$this->clientError(
- _("You cannot unfollow yourself!"),
+ _("You cannot unfollow yourself."),
403,
$this->format
);
diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index 8fc4367388..73ecc9249a 100644
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -126,7 +126,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
parent::handle($args);
if (!in_array($this->format, array('xml', 'json'))) {
- $this->clientError(_('API method not found!'), 404);
+ $this->clientError(_('API method not found.'), 404);
return;
}
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index 8827d1c5ce..028d76a782 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -133,7 +133,7 @@ class ApiGroupCreateAction extends ApiAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 08348e97bd..69ead0b531 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -111,7 +111,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
400,
$this->format
);
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 4b718bce67..3309d63e7b 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -152,7 +152,7 @@ class ApiGroupJoinAction extends ApiAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 7321ff5d26..6f8d40527b 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -138,7 +138,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 4cf657579d..66b67a030e 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -129,7 +129,7 @@ class ApiGroupListAction extends ApiBareAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index c597839a88..1921c1f193 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -117,7 +117,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index dd2843161a..3c7c8e8835 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -103,7 +103,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index aae4d249c3..7aa49b1bf3 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -102,7 +102,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
$this->showSingleJsonGroup($this->group);
break;
default:
- $this->clientError(_('API method not found!'), 404, $this->format);
+ $this->clientError(_('API method not found.'), 404, $this->format);
break;
}
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index f2c459e6fd..7b4017531c 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -85,7 +85,7 @@ class ApiHelpTestAction extends ApiPrivateAuthAction
$this->endDocument('json');
} else {
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 8dc8793b53..f7d52f0208 100644
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -99,7 +99,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
parent::handle($args);
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;
}
diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php
index 2efd59b37f..f7a3dd60a0 100644
--- a/actions/apistatusesretweets.php
+++ b/actions/apistatusesretweets.php
@@ -109,7 +109,7 @@ class ApiStatusesRetweetsAction extends ApiAuthAction
$this->showJsonTimeline($strm);
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index e26c009c44..0315d2953e 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -105,7 +105,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
parent::handle($args);
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;
}
diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index ed1d151bfc..ab96f2e5f9 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -130,7 +130,7 @@ class ApiStatusnetConfigAction extends ApiAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index bbf891a899..5109cd8062 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -90,7 +90,7 @@ class ApiStatusnetVersionAction extends ApiPrivateAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 2c691bb84c..0ba324057e 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -108,7 +108,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
parent::handle($args);
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;
}
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 700f6e0fdc..1027d97d44 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -143,7 +143,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
$this->showJsonTimeline($this->notices);
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 9ec7447e64..ef58b103c5 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -153,7 +153,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
$this->showJsonTimeline($this->notices);
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 22c577f397..af414c6804 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -147,7 +147,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
break;
default:
$this->clientError(
- _('API method not found!'),
+ _('API method not found.'),
404,
$this->format
);
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 5f5ea37b13..828eae6cf6 100644
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -153,7 +153,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
$this->showJsonTimeline($this->notices);
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 19f40aebc9..9dc2162cc4 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -148,7 +148,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
$this->showJsonTimeline($this->notices);
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 633f3c36e6..3f4a46c0fa 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -128,7 +128,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
$this->showJsonTimeline($this->notices);
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelineretweetedbyme.php b/actions/apitimelineretweetedbyme.php
index 1e65678ad5..88652c3fdc 100644
--- a/actions/apitimelineretweetedbyme.php
+++ b/actions/apitimelineretweetedbyme.php
@@ -119,7 +119,7 @@ class ApiTimelineRetweetedByMeAction extends ApiAuthAction
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
index 681b0b9e9e..113ab96d2c 100644
--- a/actions/apitimelineretweetedtome.php
+++ b/actions/apitimelineretweetedtome.php
@@ -118,7 +118,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php
index 479bff4315..6ca2c779cb 100644
--- a/actions/apitimelineretweetsofme.php
+++ b/actions/apitimelineretweetsofme.php
@@ -119,7 +119,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 1a50520f45..1427d23b6a 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -138,7 +138,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
$this->showJsonTimeline($this->notices);
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
}
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 14c62a52e7..830b16941d 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -162,7 +162,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$this->showJsonTimeline($this->notices);
break;
default:
- $this->clientError(_('API method not found!'), $code = 404);
+ $this->clientError(_('API method not found.'), $code = 404);
break;
}
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index aa7aec5a41..a7fe0dcc1e 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -98,7 +98,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction
}
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;
}
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 934f14ec45..0b4caf5bf3 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -70,14 +70,14 @@ class BlockedfromgroupAction extends GroupDesignAction
}
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/deletenotice.php b/actions/deletenotice.php
index ba8e86d0f4..69cb1ebe87 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -155,7 +155,7 @@ class DeletenoticeAction extends Action
if (!$token || $token != common_session_token()) {
$this->showForm(_('There was a problem with your session token. ' .
- ' Try again, please.'));
+ 'Try again, please.'));
return;
}
diff --git a/actions/editgroup.php b/actions/editgroup.php
index cf16080356..ad0b6e185d 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -81,7 +81,7 @@ class EditgroupAction extends GroupDesignAction
}
if (!$nickname) {
- $this->clientError(_('No nickname'), 404);
+ $this->clientError(_('No nickname.'), 404);
return false;
}
@@ -93,14 +93,14 @@ class EditgroupAction extends GroupDesignAction
}
if (!$this->group) {
- $this->clientError(_('No such group'), 404);
+ $this->clientError(_('No such group.'), 404);
return false;
}
$cur = common_current_user();
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;
}
@@ -165,7 +165,7 @@ class EditgroupAction extends GroupDesignAction
{
$cur = common_current_user();
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;
}
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 761aaa8f31..bfef2970da 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -57,7 +57,7 @@ class EmailsettingsAction extends AccountSettingsAction
function title()
{
- return _('Email Settings');
+ return _('Email settings');
}
/**
@@ -118,7 +118,7 @@ class EmailsettingsAction extends AccountSettingsAction
} else {
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
- $this->input('email', _('Email Address'),
+ $this->input('email', _('Email address'),
($this->arg('email')) ? $this->arg('email') : null,
_('Email address, like "UserName@example.org"'));
$this->elementEnd('li');
@@ -328,7 +328,7 @@ class EmailsettingsAction extends AccountSettingsAction
return;
}
if (!Validate::email($email, common_config('email', 'check_domain'))) {
- $this->showForm(_('Not a valid email address'));
+ $this->showForm(_('Not a valid email address.'));
return;
} else if ($user->email == $email) {
$this->showForm(_('That is already your email address.'));
diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index f65bf511af..5af7109cb4 100644
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -71,7 +71,7 @@ class GroupbyidAction extends Action
$id = $this->arg('id');
if (!$id) {
- $this->clientError(_('No ID'));
+ $this->clientError(_('No ID.'));
return false;
}
@@ -80,7 +80,7 @@ class GroupbyidAction extends Action
$this->group = User_group::staticGet('id', $id);
if (!$this->group) {
- $this->clientError(_('No such group'), 404);
+ $this->clientError(_('No such group.'), 404);
return false;
}
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 1c998efe1e..e290ba5141 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -81,7 +81,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
}
if (!$nickname) {
- $this->clientError(_('No nickname'), 404);
+ $this->clientError(_('No nickname.'), 404);
return false;
}
@@ -94,14 +94,14 @@ class GroupDesignSettingsAction extends DesignSettingsAction
}
if (!$this->group) {
- $this->clientError(_('No such group'), 404);
+ $this->clientError(_('No such group.'), 404);
return false;
}
$cur = common_current_user();
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;
}
@@ -284,7 +284,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
if (empty($id)) {
common_log_db_error($id, 'INSERT', __FILE__);
- $this->showForm(_('Unable to save your design settings!'));
+ $this->showForm(_('Unable to save your design settings.'));
return;
}
@@ -294,7 +294,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
if (empty($result)) {
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');
return;
}
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index a9dc7eb1d9..f197aef33e 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -83,7 +83,7 @@ class GrouplogoAction extends GroupDesignAction
}
if (!$nickname) {
- $this->clientError(_('No nickname'), 404);
+ $this->clientError(_('No nickname.'), 404);
return false;
}
@@ -96,14 +96,14 @@ class GrouplogoAction extends GroupDesignAction
}
if (!$this->group) {
- $this->clientError(_('No such group'), 404);
+ $this->clientError(_('No such group.'), 404);
return false;
}
$cur = common_current_user();
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;
}
@@ -175,7 +175,7 @@ class GrouplogoAction extends GroupDesignAction
if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__);
- $this->serverError(_('User without matching profile'));
+ $this->serverError(_('User without matching profile.'));
return;
}
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 5c59594c56..0f47c268dd 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -73,14 +73,14 @@ class GroupmembersAction extends GroupDesignAction
}
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/imsettings.php b/actions/imsettings.php
index f57933b43f..751c6117cd 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -56,7 +56,7 @@ class ImsettingsAction extends ConnectSettingsAction
function title()
{
- return _('IM Settings');
+ return _('IM settings');
}
/**
@@ -121,7 +121,7 @@ class ImsettingsAction extends ConnectSettingsAction
} else {
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
- $this->input('jabber', _('IM Address'),
+ $this->input('jabber', _('IM address'),
($this->arg('jabber')) ? $this->arg('jabber') : null,
sprintf(_('Jabber or GTalk address, '.
'like "UserName@example.org". '.
diff --git a/actions/joingroup.php b/actions/joingroup.php
index 5ca34bd9cc..05e33e7cb1 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -73,21 +73,21 @@ class JoingroupAction extends Action
}
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;
}
$cur = common_current_user();
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;
}
@@ -125,7 +125,7 @@ class JoingroupAction extends Action
if (!$result) {
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));
}
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 250ade221e..9ad7d6e7c8 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -129,7 +129,7 @@ class MakeadminAction extends Action
'profile_id' => $this->profile->id));
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->group->getBestName());
}
@@ -142,7 +142,7 @@ class MakeadminAction extends Action
if (!$result) {
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->group->getBestName());
}
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 3504520913..25e58feab3 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -182,7 +182,7 @@ class NewmessageAction extends Action
$this->elementEnd('head');
$this->elementStart('body');
$this->element('p', array('id' => 'command_result'),
- sprintf(_('Direct message to %s sent'),
+ sprintf(_('Direct message to %s sent.'),
$this->other->nickname));
$this->elementEnd('body');
$this->elementEnd('html');
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index d39c7c449a..3779fcfaaa 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -305,7 +305,7 @@ class PathsAdminPanelForm extends AdminForm
$this->unli();
$this->li();
- $this->input('sslserver', _('SSL Server'),
+ $this->input('sslserver', _('SSL server'),
_('Server to direct SSL requests to'), 'site');
$this->unli();
$this->out->elementEnd('ul');
diff --git a/actions/showgroup.php b/actions/showgroup.php
index c0de4c653b..06ae572e81 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -118,7 +118,7 @@ class ShowgroupAction extends GroupDesignAction
}
if (!$nickname) {
- $this->clientError(_('No nickname'), 404);
+ $this->clientError(_('No nickname.'), 404);
return false;
}
@@ -134,7 +134,7 @@ class ShowgroupAction extends GroupDesignAction
common_redirect(common_local_url('groupbyid', $args), 301);
return false;
} else {
- $this->clientError(_('No such group'), 404);
+ $this->clientError(_('No such group.'), 404);
return false;
}
}
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 5e29f4c191..dd388a18a2 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -151,10 +151,10 @@ class SiteadminpanelAction extends AdminPanelAction
$values['site']['email'] = common_canonical_email($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'))) {
- $this->clientError(_('Not a valid email address'));
+ $this->clientError(_('Not a valid email address.'));
}
// Validate timezone
@@ -169,7 +169,7 @@ class SiteadminpanelAction extends AdminPanelAction
if (!is_null($values['site']['language']) &&
!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
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 672abcef8c..751495d57a 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -55,7 +55,7 @@ class SmssettingsAction extends ConnectSettingsAction
function title()
{
- return _('SMS Settings');
+ return _('SMS settings');
}
/**
@@ -135,7 +135,7 @@ class SmssettingsAction extends ConnectSettingsAction
} else {
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
- $this->input('sms', _('SMS Phone number'),
+ $this->input('sms', _('SMS phone number'),
($this->arg('sms')) ? $this->arg('sms') : null,
_('Phone number, no punctuation or spaces, '.
'with area code'));
diff --git a/actions/tagother.php b/actions/tagother.php
index e9e13b939b..735d876da2 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -163,8 +163,8 @@ class TagotherAction extends Action
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
- $this->showForm(_('There was a problem with your session token.'.
- ' Try again, please.'));
+ $this->showForm(_('There was a problem with your session token. '.
+ 'Try again, please.'));
return;
}
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 4a5863489e..dbb4e41538 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -81,7 +81,7 @@ class UnsubscribeAction extends Action
$other = Profile::staticGet('id', $other_id);
if (!$other) {
- $this->clientError(_('No profile with that id.'));
+ $this->clientError(_('No profile with that ID.'));
return;
}
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 31a097970d..1cf8780006 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -207,7 +207,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
if (empty($id)) {
common_log_db_error($id, 'INSERT', __FILE__);
- $this->showForm(_('Unable to save your design settings!'));
+ $this->showForm(_('Unable to save your design settings.'));
return;
}
@@ -217,7 +217,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
if (empty($result)) {
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');
return;
}
@@ -260,7 +260,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
if (empty($id)) {
common_log_db_error($id, 'INSERT', __FILE__);
- $this->showForm(_('Unable to save your design settings!'));
+ $this->showForm(_('Unable to save your design settings.'));
return;
}
@@ -270,7 +270,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
if (empty($result)) {
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');
return;
}
diff --git a/lib/command.php b/lib/command.php
index 080d83959f..5a1a8bf33a 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -315,7 +315,7 @@ class WhoisCommand extends Command
$whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
$recipient->profileurl);
if ($recipient->fullname) {
- $whois .= "\n" . sprintf(_('Fullname: %s'), $recipient->fullname);
+ $whois .= "\n" . sprintf(_('Full name: %s'), $recipient->fullname);
}
if ($recipient->location) {
$whois .= "\n" . sprintf(_('Location: %s'), $recipient->location);
diff --git a/lib/common.php b/lib/common.php
index fb5e5919e0..7342c177a6 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -197,7 +197,7 @@ function _have_config()
// XXX: Find a way to use htmlwriter for this instead of handcoded markup
if (!_have_config()) {
echo ''. _('No configuration file found. ') .'
';
- echo ''. _('I looked for configuration files in the following places: ') .'
'. implode($_config_files, '
');
+ echo '
'. _('I looked for configuration files in the following places: ') .'
'. implode($_config_files, '
');
echo '
'. _('You may wish to run the installer to fix this.') .'
';
echo ''. _('Go to the installer.') .'';
exit;
diff --git a/lib/mail.php b/lib/mail.php
index 472a88e061..c724764cc8 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -251,11 +251,11 @@ function mail_subscribe_notify_profile($listenee, $other)
common_config('site', 'name'),
$other->profileurl,
($other->location) ?
- sprintf(_("Location: %s\n"), $other->location) : '',
+ sprintf(_("Location: %s"), $other->location) . "\n" : '',
($other->homepage) ?
- sprintf(_("Homepage: %s\n"), $other->homepage) : '',
+ sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '',
($other->bio) ?
- sprintf(_("Bio: %s\n\n"), $other->bio) : '',
+ sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '',
common_config('site', 'name'),
common_local_url('emailsettings'));
@@ -652,4 +652,3 @@ function mail_notify_attn($user, $notice)
common_init_locale();
mail_to_user($user, $subject, $body);
}
-
diff --git a/lib/mediafile.php b/lib/mediafile.php
index 29d752f0c6..e3d5b1dbcc 100644
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -176,7 +176,7 @@ class MediaFile
// Should never actually get here
@unlink($_FILES[$param]['tmp_name']);
- throw new ClientException(_('File exceeds user\'s quota!'));
+ throw new ClientException(_('File exceeds user\'s quota.'));
return;
}
@@ -198,7 +198,7 @@ class MediaFile
}
} else {
- throw new ClientException(_('Could not determine file\'s mime-type!'));
+ throw new ClientException(_('Could not determine file\'s MIME type.'));
return;
}
@@ -213,7 +213,7 @@ class MediaFile
// Should never actually get here
- throw new ClientException(_('File exceeds user\'s quota!'));
+ throw new ClientException(_('File exceeds user\'s quota.'));
return;
}
@@ -234,7 +234,7 @@ class MediaFile
$stream['uri'] . ' ' . $filepath));
}
} else {
- throw new ClientException(_('Could not determine file\'s mime-type!'));
+ throw new ClientException(_('Could not determine file\'s MIME type.'));
return;
}
@@ -272,7 +272,7 @@ class MediaFile
$hint = '';
}
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)
@@ -286,4 +286,4 @@ class MediaFile
}
}
-}
\ No newline at end of file
+}
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 89f63e3211..e1207774fd 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -123,7 +123,7 @@ class SubscriptionListItem extends ProfileListItem
}
$this->out->elementEnd('ul');
} else {
- $this->out->text(_('(none)'));
+ $this->out->text(_('(None)'));
}
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 20105b602e..cef9c4bd07 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -298,7 +298,7 @@ class XMPPDaemon extends Daemon
$content_shortened = common_shorten_links($body);
if (Notice::contentTooLong($content_shortened)) {
$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(),
mb_strlen($content_shortened)));
return;