wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lots of tiny message changes.

Browse Source 
* 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:
Siebrand Mazeland 2010-01-10 12:26:24 +01:00
parent 26b0324027
commit 4af6b7f5c3
58 changed files with 96 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/apidirectmessage.php
View File

@ -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;
}
}

4
actions/apifavoritecreate.php
View File

@ -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
);

4
actions/apifavoritedestroy.php
View File

@ -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
);

2
actions/apifriendshipscreate.php
View File

@ -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
);

4
actions/apifriendshipsdestroy.php
View File

@ -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
);

2
actions/apifriendshipsshow.php
View File

@ -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;
}

2
actions/apigroupcreate.php
View File

@ -133,7 +133,7 @@ class ApiGroupCreateAction extends ApiAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apigroupismember.php
View File

@ -111,7 +111,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
400,
$this->format
);

2
actions/apigroupjoin.php
View File

@ -152,7 +152,7 @@ class ApiGroupJoinAction extends ApiAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apigroupleave.php
View File

@ -138,7 +138,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apigrouplist.php
View File

@ -129,7 +129,7 @@ class ApiGroupListAction extends ApiBareAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apigrouplistall.php
View File

@ -117,7 +117,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apigroupmembership.php
View File

@ -103,7 +103,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apigroupshow.php
View File

@ -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;
}

2
actions/apihelptest.php
View File

@ -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
);

2
actions/apistatusesdestroy.php
View File

@ -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;
}

2
actions/apistatusesretweets.php
View File

@ -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;
}
}

2
actions/apistatusesshow.php
View File

@ -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;
}

2
actions/apistatusnetconfig.php
View File

@ -130,7 +130,7 @@ class ApiStatusnetConfigAction extends ApiAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apistatusnetversion.php
View File

@ -90,7 +90,7 @@ class ApiStatusnetVersionAction extends ApiPrivateAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apisubscriptions.php
View File

@ -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;
}

2
actions/apitimelinefavorites.php
View File

@ -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;
}
}

2
actions/apitimelinefriends.php
View File

@ -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;
}
}

2
actions/apitimelinegroup.php
View File

@ -147,7 +147,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
break;
default:
$this->clientError(
_('API method not found!'),
_('API method not found.'),
404,
$this->format
);

2
actions/apitimelinehome.php
View File

@ -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;
}
}

2
actions/apitimelinementions.php
View File

@ -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;
}
}

2
actions/apitimelinepublic.php
View File

@ -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;
}
}

2
actions/apitimelineretweetedbyme.php
View File

@ -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;
}
}

2
actions/apitimelineretweetedtome.php
View File

@ -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;
}
}

2
actions/apitimelineretweetsofme.php
View File

@ -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;
}
}

2
actions/apitimelinetag.php
View File

@ -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;
}
}

2
actions/apitimelineuser.php
View File

@ -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;
}

2
actions/apiusershow.php
View File

@ -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;
}

4
actions/blockedfromgroup.php
View File

@ -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;
}

2
actions/deletenotice.php
View File

@ -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;
}

8
actions/editgroup.php
View File

@ -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;
}

6
actions/emailsettings.php
View File

@ -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.'));

4
actions/groupbyid.php
View File

@ -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;
}

10
actions/groupdesignsettings.php
View File

@ -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;
}

8
actions/grouplogo.php
View File

@ -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;
}

4
actions/groupmembers.php
View File

@ -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;
}

4
actions/imsettings.php
View File

@ -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". '.

8
actions/joingroup.php
View File

@ -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));
}

4
actions/makeadmin.php
View File

@ -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());
}

2
actions/newmessage.php
View File

@ -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');

2
actions/pathsadminpanel.php
View File

@ -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');

4
actions/showgroup.php
View File

@ -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;
}
}

6
actions/siteadminpanel.php
View File

@ -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

4
actions/smssettings.php
View File

@ -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'));

4
actions/tagother.php
View File

@ -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;
}

2
actions/unsubscribe.php
View File

@ -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;
}

8
actions/userdesignsettings.php
View File

@ -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;
}

2
lib/command.php
View File

@ -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);

2
lib/common.php
View File

@ -197,7 +197,7 @@ function _have_config()
// XXX: Find a way to use htmlwriter for this instead of handcoded markup
if (!_have_config()) {
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 '<a href="install.php">'. _('Go to the installer.') .'</a>';
exit;

7
lib/mail.php
View File

@ -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);
}

12
lib/mediafile.php
View File

@ -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
}
}
}
}

2
lib/subscriptionlist.php
View File

@ -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');

2
scripts/xmppdaemon.php
View File

@ -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;