GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' into adminpanel

This commit is contained in:
Evan Prodromou 2009-11-08 21:41:43 -05:00
parent 76b0e6e6f4 aa0d9a8615
commit 691beefd0f
158 changed files with 126804 additions and 219806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/all.php
View File

@ -129,7 +129,7 @@ class AllAction extends ProfileAction
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
$message .= _('Try subscribing to more users, [join a group](%%action.groups%%) or post something yourself.');
$message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
} else {
$message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
}

2
actions/allrss.php
View File

@ -56,7 +56,7 @@ class AllrssAction extends Rss10Action
*
* @param array $args Web and URL arguments
*
* @return boolean false if user doesn't exist
* @return boolean false if user does not exist
*/
function prepare($args)
{

2
actions/apiaccountratelimitstatus.php
View File

@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
require_once INSTALLDIR . '/lib/apibareauth.php';
/**
* We don't have a rate limit, but some clients check this method.
* We do not have a rate limit, but some clients check this method.
* It always returns the same thing: 150 hits left.
*
* @category API

2
actions/apiaccountupdateprofileimage.php
View File

@ -102,7 +102,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction
}
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apiblockcreate.php
View File

@ -94,7 +94,7 @@ class ApiBlockCreateAction extends ApiAuthAction
}
if (empty($this->user) || empty($this->other)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apiblockdestroy.php
View File

@ -93,7 +93,7 @@ class ApiBlockDestroyAction extends ApiAuthAction
}
if (empty($this->user) || empty($this->other)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apidirectmessage.php
View File

@ -74,7 +74,7 @@ class ApiDirectMessageAction extends ApiAuthAction
$this->user = $this->auth_user;
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apidirectmessagenew.php
View File

@ -72,7 +72,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
$this->user = $this->auth_user;
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apifriendshipsdestroy.php
View File

@ -113,7 +113,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
return;
}
// Don't allow unsubscribing from yourself!
// Do not allow unsubscribing from yourself!
if ($this->user->id == $this->other->id) {
$this->clientError(

2
actions/apigroupcreate.php
View File

@ -109,7 +109,7 @@ class ApiGroupCreateAction extends ApiAuthAction
}
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apigroupismember.php
View File

@ -87,7 +87,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
parent::handle($args);
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apigroupjoin.php
View File

@ -96,7 +96,7 @@ class ApiGroupJoinAction extends ApiAuthAction
}
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apigroupleave.php
View File

@ -96,7 +96,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
}
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apigrouplist.php
View File

@ -87,7 +87,7 @@ class ApiGroupListAction extends ApiBareAuthAction
parent::handle($args);
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apistatusesupdate.php
View File

@ -136,7 +136,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
}
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apisubscriptions.php
View File

@ -84,7 +84,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return false;
}

2
actions/apitimelinefavorites.php
View File

@ -67,7 +67,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apitimelinefriends.php
View File

@ -76,7 +76,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apitimelinementions.php
View File

@ -76,7 +76,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

2
actions/apitimelineuser.php
View File

@ -78,7 +78,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
$this->clientError(_('No such user!'), 404, $this->format);
$this->clientError(_('No such user.'), 404, $this->format);
return;
}

4
actions/attachment.php
View File

@ -146,7 +146,7 @@ class AttachmentAction extends Action
}
/**
* Don't show local navigation
* Do not show local navigation
*
* @return void
*/
@ -170,7 +170,7 @@ class AttachmentAction extends Action
}
/**
* Don't show page notice
* Do not show page notice
*
* @return void
*/

2
actions/avatarbynickname.php
View File

@ -49,7 +49,7 @@ class AvatarbynicknameAction extends Action
*
* @param array $args query arguments
*
* @return boolean false if nickname or user isn't found
* @return boolean false if nickname or user is not found
*/
function handle($args)
{

4
actions/foaf.php
View File

@ -136,7 +136,7 @@ class FoafAction extends Action
$person = $this->showMicrobloggingAccount($this->profile,
common_root_url(), $this->user->uri, false);
// Get users who subscribe to user
// Get people who subscribe to user
$sub = new Subscription();
$sub->subscribed = $this->profile->id;
@ -250,7 +250,7 @@ class FoafAction extends Action
if ($isSubscriber) {
$this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct'));
} else {
// Get users user is subscribed to
// Get people user is subscribed to
$sub = new Subscription();
$sub->subscriber = $profile->id;
$sub->whereAdd('subscriber != subscribed');

2
actions/groupblock.php
View File

@ -95,7 +95,7 @@ class GroupblockAction extends Action
$this->clientError(_('User is already blocked from group.'));
return false;
}
// XXX: could have proactive blocks, but we don't have UI for it.
// XXX: could have proactive blocks, but we do not have UI for it.
if (!$this->profile->isMember($this->group)) {
$this->clientError(_('User is not a member of group.'));
return false;

7
actions/groups.php
View File

@ -88,12 +88,11 @@ class GroupsAction extends Action
{
$notice =
sprintf(_('%%%%site.name%%%% groups let you find and talk with ' .
'users of similar interests. After you join a group ' .
'people of similar interests. After you join a group ' .
'you can send messages to all other members using the ' .
'syntax "!groupname". Are you not seeing any groups ' .
'you like? Try ' .
'syntax "!groupname". Don\'t see a group you like? Try ' .
'[searching for one](%%%%action.groupsearch%%%%) or ' .
'[start your own](%%%%action.newgroup%%%%)!'));
'[start your own!](%%%%action.newgroup%%%%)'));
$this->elementStart('div', 'instructions');
$this->raw(common_markup_to_html($notice));
$this->elementEnd('div');

8
actions/imsettings.php
View File

@ -69,7 +69,7 @@ class ImsettingsAction extends ConnectSettingsAction
{
return _('You can send and receive notices through '.
'Jabber/GTalk [instant messages](%%doc.im%%). '.
'Configure your instant messages address and settings below.');
'Configure your address and settings below.');
}
/**
@ -97,7 +97,7 @@ class ImsettingsAction extends ConnectSettingsAction
'action' =>
common_local_url('imsettings')));
$this->elementStart('fieldset', array('id' => 'settings_im_address'));
$this->element('legend', null, _('IM address'));
$this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token());
if ($user->jabber) {
@ -111,7 +111,7 @@ class ImsettingsAction extends ConnectSettingsAction
if ($confirm) {
$this->element('p', 'form_unconfirmed', $confirm->address);
$this->element('p', 'form_note',
sprintf(_('Awaiting confirmation on this IM address. '.
sprintf(_('Awaiting confirmation on this address. '.
'Check your Jabber/GTalk account for a '.
'message with further instructions. '.
'(Did you add %s to your buddy list?)'),
@ -151,7 +151,7 @@ class ImsettingsAction extends ConnectSettingsAction
$this->elementStart('li');
$this->checkbox('jabberreplies',
_('Send me replies through Jabber/GTalk '.
'from users I am not subscribed to.'),
'from people I\'m not subscribed to.'),
$user->jabberreplies);
$this->elementEnd('li');
$this->elementStart('li');

10
actions/invite.php
View File

@ -133,7 +133,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementEnd('ul');
}
if ($this->subbed) {
$this->element('p', null, _('These are already users and you were automatically subscribed to them:'));
$this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
$this->elementStart('ul');
foreach ($this->subbed as $other) {
$this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
@ -141,7 +141,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementEnd('ul');
}
if ($this->sent) {
$this->element('p', null, _('Invitation(s) sent to the following e-mail addresses:'));
$this->element('p', null, _('Invitation(s) sent to the following people:'));
$this->elementStart('ul');
foreach ($this->sent as $other) {
$this->element('li', null, $other);
@ -226,9 +226,9 @@ class InviteAction extends CurrentUserDesignAction
$headers['Subject'] = sprintf(_('%1$s has invited you to join them on %2$s'), $bestname, $sitename);
$body = sprintf(_("%1\$s has invited you to join them on %2\$s (%3\$s).\n\n".
"%2\$s is a micro-blogging service that lets you keep up-to-date with those you know and those who interest you.\n\n".
"You can also share news about yourself, your thoughts, or your life online with users who know about you. ".
"It is also great for meeting others who share your interests.\n\n".
"%2\$s is a micro-blogging service that lets you keep up-to-date with people you know and people who interest you.\n\n".
"You can also share news about yourself, your thoughts, or your life online with people who know about you. ".
"It's also great for meeting new people who share your interests.\n\n".
"%1\$s said:\n\n%4\$s\n\n".
"You can see %1\$s's profile page on %2\$s here:\n\n".
"%5\$s\n\n".

2
actions/login.php
View File

@ -159,7 +159,7 @@ class LoginAction extends Action
$url = common_get_returnto();
if ($url) {
// We don't have to return to it again
// We do not have to return to it again
common_set_returnto(null);
} else {
$url = common_local_url('all',

2
actions/logout.php
View File

@ -81,7 +81,7 @@ class LogoutAction extends Action
{
common_set_user(null);
common_real_login(false); // not logged in
common_forgetme(); // don't log back in!
common_forgetme(); // do not log back in!
}
}

2
actions/microsummary.php
View File

@ -59,7 +59,7 @@ class MicrosummaryAction extends Action
$user = User::staticGet('nickname', $nickname);
if (!$user) {
$this->clientError(_('No such user'), 404);
$this->clientError(_('No such user.'), 404);
return;
}

4
actions/newmessage.php
View File

@ -61,7 +61,7 @@ class NewmessageAction extends Action
/**
* Title of the page
*
* Note that this usually doesn't get called unless something went wrong
* Note that this usually does not get called unless something went wrong
*
* @return string page title
*/
@ -113,7 +113,7 @@ class NewmessageAction extends Action
$this->other = User::staticGet('id', $this->to);
if (!$this->other) {
$this->clientError(_('No such user'), 404);
$this->clientError(_('No such user.'), 404);
return false;
}

2
actions/newnotice.php
View File

@ -59,7 +59,7 @@ class NewnoticeAction extends Action
/**
* Title of the page
*
* Note that this usually doesn't get called unless something went wrong
* Note that this usually does not get called unless something went wrong
*
* @return string page title
*/

2
actions/noticesearch.php
View File

@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/searchaction.php';
* @author Robin Millette <millette@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
* @todo common parent for user and content search?
* @todo common parent for people and content search?
*/
class NoticesearchAction extends SearchAction
{

4
actions/opensearch.php
View File

@ -52,7 +52,7 @@ class OpensearchAction extends Action
*
* @param array $args query arguments
*
* @return boolean false if user doesn't exist
* @return boolean false if user does not exist
*/
function handle($args)
{
@ -61,7 +61,7 @@ class OpensearchAction extends Action
$short_name = '';
if ($type == 'people') {
$type = 'peoplesearch';
$short_name = _('User Search');
$short_name = _('People Search');
} else {
$type = 'noticesearch';
$short_name = _('Notice Search');

2
actions/passwordsettings.php
View File

@ -97,7 +97,7 @@ class PasswordsettingsAction extends AccountSettingsAction
$this->elementStart('ul', 'form_data');
// Users who logged in with OpenID won't have a pwd
// Users who logged in with OpenID will not have a pwd
if ($user->password) {
$this->elementStart('li');
$this->password('oldpassword', _('Old password'));

2
actions/peoplesearch.php
View File

@ -49,7 +49,7 @@ class PeoplesearchAction extends SearchAction
{
function getInstructions()
{
return _('Search for users on %%site.name%% by their name, location, or interests. ' .
return _('Search for people on %%site.name%% by their name, location, or interests. ' .
'Separate the terms by spaces; they must be 3 characters or more.');
}

2
actions/peopletag.php
View File

@ -67,7 +67,7 @@ class PeopletagAction extends Action
$this->tag = $this->trimmed('tag');
if (!common_valid_profile_tag($this->tag)) {
$this->clientError(sprintf(_('Not a valid user tag: %s'),
$this->clientError(sprintf(_('Not a valid people tag: %s'),
$this->tag));
return;
}

4
actions/profilesettings.php
View File

@ -68,8 +68,8 @@ class ProfilesettingsAction extends AccountSettingsAction
function getInstructions()
{
return _('You can update your personal profile info here ' .
'so readers know more about you.');
return _('You can update your personal profile info here '.
'so people know more about you.');
}
function showScripts()

12
actions/register.php
View File

@ -82,14 +82,14 @@ class RegisterAction extends Action
}
if (common_config('site', 'inviteonly') && empty($this->code)) {
$this->clientError(_('Sorry. Only those invited can register.'));
$this->clientError(_('Sorry, only invited people can register.'));
return false;
}
if (!empty($this->code)) {
$this->invite = Invitation::staticGet('code', $this->code);
if (empty($this->invite)) {
$this->clientError(_('Sorry. This is an invalid invitation code.'));
$this->clientError(_('Sorry, invalid invitation code.'));
return false;
}
// Store this in case we need it
@ -174,7 +174,7 @@ class RegisterAction extends Action
$bio = $this->trimmed('bio');
$location = $this->trimmed('location');
// We don't trim these... whitespace is OK in a password!
// We do not trim these... whitespace is OK in a password!
$password = $this->arg('password');
$confirm = $this->arg('confirm');
@ -186,7 +186,7 @@ class RegisterAction extends Action
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
$this->clientError(_('Sorry. Only those invited can register.'));
$this->clientError(_('Sorry, only invited people can register.'));
return;
}
@ -401,7 +401,7 @@ class RegisterAction extends Action
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
$this->clientError(_('Sorry. Only those invited can register.'));
$this->clientError(_('Sorry, only invited people can register.'));
return;
}
@ -542,7 +542,7 @@ class RegisterAction extends Action
'(%%%%action.imsettings%%%%) '.
'so you can send notices '.
'through instant messages.' . "\n" .
'* [Search for users](%%%%action.peoplesearch%%%%) '.
'* [Search for people](%%%%action.peoplesearch%%%%) '.
'that you may know or '.
'that share your interests. ' . "\n" .
'* Update your [profile settings]'.

2
actions/remotesubscribe.php
View File

@ -151,7 +151,7 @@ class RemotesubscribeAction extends Action
$this->profile_url = $this->trimmed('profile_url');
if (!$this->profile_url) {
$this->showForm(_('No such user'));
$this->showForm(_('No such user.'));
return;
}

4
actions/replies.php
View File

@ -195,12 +195,12 @@ class RepliesAction extends OwnerDesignAction
function showEmptyListMessage()
{
$message = sprintf(_('This is the timeline showing replies to %s but %s has not received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
$message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
$message .= _('You can engage other users in a conversation, subscribe to more users or [join groups](%%action.groups%%).');
$message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).');
} else {
$message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
}

2
actions/showgroup.php
View File

@ -418,7 +418,7 @@ class ShowgroupAction extends GroupDesignAction
// XXX: WORM cache this
$members = $this->group->getMembers();
$members_count = 0;
/** $member->count() doesn't work. */
/** $member->count() does not work. */
while ($members->fetch()) {
$members_count++;
}

8
actions/showmessage.php
View File

@ -137,7 +137,7 @@ class ShowmessageAction extends MailboxAction
}
/**
* Don't show local navigation
* Do not show local navigation
*
* @return void
*/
@ -147,7 +147,7 @@ class ShowmessageAction extends MailboxAction
}
/**
* Don't show page notice
* Do not show page notice
*
* @return void
*/
@ -157,7 +157,7 @@ class ShowmessageAction extends MailboxAction
}
/**
* Don't show aside
* Do not show aside
*
* @return void
*/
@ -167,7 +167,7 @@ class ShowmessageAction extends MailboxAction
}
/**
* Don't show any instructions
* Do not show any instructions
*
* @return string
*/

6
actions/shownotice.php
View File

@ -208,7 +208,7 @@ class ShownoticeAction extends OwnerDesignAction
}
/**
* Don't show local navigation
* Do not show local navigation
*
* @return void
*/
@ -234,7 +234,7 @@ class ShownoticeAction extends OwnerDesignAction
}
/**
* Don't show page notice
* Do not show page notice
*
* @return void
*/
@ -244,7 +244,7 @@ class ShownoticeAction extends OwnerDesignAction
}
/**
* Don't show aside
* Do not show aside
*
* @return void
*/

2
actions/showstream.php
View File

@ -253,7 +253,7 @@ class ShowstreamAction extends ProfileAction
}
}
// We don't show the author for a profile, since we already know who it is!
// We do not show the author for a profile, since we already know who it is!
class ProfileNoticeList extends NoticeList
{

2
actions/smssettings.php
View File

@ -101,7 +101,7 @@ class SmssettingsAction extends ConnectSettingsAction
common_local_url('smssettings')));
$this->elementStart('fieldset', array('id' => 'settings_sms_address'));
$this->element('legend', null, _('SMS address'));
$this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token());
if ($user->sms) {

8
actions/subscribers.php
View File

@ -60,12 +60,12 @@ class SubscribersAction extends GalleryAction
$user =& common_current_user();
if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null,
_('These are the users who have subscribed to '.
_('These are the people who listen to '.
'your notices.'));
} else {
$this->element('p', null,
sprintf(_('These are the users who '.
'have subscribed to %s\'s notices.'),
sprintf(_('These are the people who '.
'listen to %s\'s notices.'),
$this->profile->nickname));
}
}
@ -105,7 +105,7 @@ class SubscribersAction extends GalleryAction
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
$message = _('You have no subscribers. Try subscribing to users you know and they might return the favor');
$message = _('You have no subscribers. Try subscribing to people you know and they might return the favor');
} else {
$message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
}

10
actions/subscriptions.php
View File

@ -62,12 +62,12 @@ class SubscriptionsAction extends GalleryAction
$user =& common_current_user();
if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null,
_('These are the users whose notices '.
'you have subscribed to.'));
_('These are the people whose notices '.
'you listen to.'));
} else {
$this->element('p', null,
sprintf(_('These are the users whose '.
'notices %s has subscribed to.'),
sprintf(_('These are the people whose '.
'notices %s listens to.'),
$this->profile->nickname));
}
}
@ -118,7 +118,7 @@ class SubscriptionsAction extends GalleryAction
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
$message = _('You have not subscribed to anyone\'s notices right now. Try subscribing to users you know. Try [user search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you are a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to users you already follow there.');
$message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to people you already follow there.');
} else {
$message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
}

2
actions/sup.php
View File

@ -61,7 +61,7 @@ class SupAction extends Action
$notice = new Notice();
# XXX: cache this. Depends on how big this protocol becomes;
# Re-doing this query every 15 seconds isn't the end of the world.
# Re-doing this query every 15 seconds is not the end of the world.
$divider = common_sql_date(time() - $seconds);

2
actions/tagother.php
View File

@ -190,7 +190,7 @@ class TagotherAction extends Action
!Subscription::pkeyGet(array('subscriber' => $this->profile->id,
'subscribed' => $user->id)))
{
$this->clientError(_('You can only tag users you are subscribed to or who are subscribed to you.'));
$this->clientError(_('You can only tag people you are subscribed to or who are subscribed to you.'));
return;
}

2
actions/twitapisearchatom.php
View File

@ -250,7 +250,7 @@ class TwitapisearchatomAction extends ApiAction
}
// FIXME: this alternate link is not quite right because our
// web-based notice search doesn't support a rpp (responses per
// web-based notice search does not support a rpp (responses per
// page) param yet
$this->element('link', array('type' => 'text/html',

2
actions/twitapitrends.php
View File

@ -55,7 +55,7 @@ class TwitapitrendsAction extends ApiAction
*
* @param array $args Web and URL arguments
*
* @return boolean false if user doesn't exist
* @return boolean false if user does not exist
*/
function prepare($args)
{

8
classes/File_redirection.php
View File

@ -53,7 +53,7 @@ class File_redirection extends Memcached_DataObject
'connect_timeout' => 10, // # seconds to wait
'max_redirs' => $redirs, // # max number of http redirections to follow
'follow_redirects' => true, // Follow redirects
'store_body' => false, // We won't need body content here.
'store_body' => false, // We will not need body content here.
));
return $request;
}
@ -81,12 +81,12 @@ class File_redirection extends Memcached_DataObject
}
try {
$request = self::_commonHttp($short_url, $redirs);
// Don't include body in output
// Do not include body in output
$request->setMethod(HTTP_Request2::METHOD_HEAD);
$response = $request->send();
if (405 == $response->getStatus()) {
// Server doesn't support HEAD method? Can this really happen?
// Server does not support HEAD method? Can this really happen?
// We'll try again as a GET and ignore the response data.
$request = self::_commonHttp($short_url, $redirs);
$response = $request->send();
@ -178,7 +178,7 @@ class File_redirection extends Memcached_DataObject
case 'aim':
case 'jabber':
case 'xmpp':
// don't touch anything
// do not touch anything
break;
default:

6
classes/Notice.php
View File

@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject
/* Add them to the database */
foreach(array_unique($hashtags) as $hashtag) {
/* elide characters we don't want in the tag */
/* elide characters we do not want in the tag */
$this->saveTag($hashtag);
}
return true;
@ -1105,7 +1105,7 @@ class Notice extends Memcached_DataObject
if (empty($recipient)) {
continue;
}
// Don't save replies from blocked profile to local user
// Do not save replies from blocked profile to local user
$recipient_user = User::staticGet('id', $recipient->id);
if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) {
continue;
@ -1131,7 +1131,7 @@ class Notice extends Memcached_DataObject
$tagged = Profile_tag::getTagged($sender->id, $tag);
foreach ($tagged as $t) {
if (!$replied[$t->id]) {
// Don't save replies from blocked profile to local user
// Do not save replies from blocked profile to local user
$t_user = User::staticGet('id', $t->id);
if ($t_user && $t_user->hasBlocked($sender)) {
continue;

4
classes/Profile.php
View File

@ -101,7 +101,7 @@ class Profile extends Memcached_DataObject
}
foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
# We don't do a scaled one if original is our scaled size
# We do not do a scaled one if original is our scaled size
if (!($avatar->width == $size && $avatar->height == $size)) {
$scaled_filename = $imagefile->resize($size);
@ -174,7 +174,7 @@ class Profile extends Memcached_DataObject
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
{
// XXX: I'm not sure this is going to be any faster. It probably isn't.
// XXX: I'm not sure this is going to be any faster. It probably is not.
$ids = Notice::stream(array($this, '_streamDirect'),
array(),
'profile:notice_ids:' . $this->id,

6
classes/User.php
View File

@ -87,7 +87,7 @@ class User extends Memcached_DataObject
return (is_null($sub)) ? false : true;
}
// 'update' won't write key columns, so we have to do it ourselves.
// 'update' will not write key columns, so we have to do it ourselves.
function updateKeys(&$orig)
{
@ -384,7 +384,7 @@ class User extends Memcached_DataObject
return false;
}
// Otherwise, cache doesn't have all faves;
// Otherwise, cache does not have all faves;
// fall through to the default
}
@ -463,7 +463,7 @@ class User extends Memcached_DataObject
{
$cache = common_memcache();
if ($cache) {
// Faves don't happen chronologically, so we need to blow
// Faves do not happen chronologically, so we need to blow
// ;last cache, too
$cache->delete(common_cache_key('fave:ids_by_user:'.$this->id));
$cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last'));

2
lib/action.php
View File

@ -456,7 +456,7 @@ class Action extends HTMLOutputter // lawsuit
_('Help'), _('Help me!'), false, 'nav_help');
if ($user || !common_config('site', 'private')) {
$this->menuItem(common_local_url('peoplesearch'),
_('Search'), _('Search for users or text'), false, 'nav_search');
_('Search'), _('Search for people or text'), false, 'nav_search');
}
Event::handle('EndPrimaryNav', array($this));
}

14
lib/api.php
View File

@ -66,7 +66,7 @@ class ApiAction extends Action
*
* @param array $args Web and URL arguments
*
* @return boolean false if user doesn't exist
* @return boolean false if user does not exist
*/
function prepare($args)
@ -138,7 +138,7 @@ class ApiAction extends Action
$design = null;
$user = $profile->getUser();
// Note: some profiles don't have an associated user
// Note: some profiles do not have an associated user
if (!empty($user)) {
$design = $user->getDesign();
@ -203,7 +203,7 @@ class ApiAction extends Action
if ($get_notice) {
$notice = $profile->getCurrentNotice();
if ($notice) {
# don't get user!
# do not get user!
$twitter_user['status'] = $this->twitterStatusArray($notice, false);
}
}
@ -263,7 +263,7 @@ class ApiAction extends Action
}
if ($include_user) {
# Don't get notice (recursive!)
# Do not get notice (recursive!)
$twitter_user = $this->twitterUserArray($profile, false);
$twitter_status['user'] = $twitter_user;
}
@ -1074,7 +1074,7 @@ class ApiAction extends Action
function initTwitterAtom()
{
$this->startXML();
// FIXME: don't hardcode the language here!
// FIXME: do not hardcode the language here!
$this->elementStart('feed', array('xmlns' => 'http://www.w3.org/2005/Atom',
'xml:lang' => 'en-US',
'xmlns:thr' => 'http://purl.org/syndication/thread/1.0'));
@ -1116,7 +1116,7 @@ class ApiAction extends Action
return User::staticGet('nickname', $nickname);
} else if ($this->arg('user_id')) {
// This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used
// overrides screen_name even if it does not get used
if (is_numeric($this->arg('user_id'))) {
return User::staticGet('id', $this->arg('user_id'));
}
@ -1146,7 +1146,7 @@ class ApiAction extends Action
return User_group::staticGet('nickname', $nickname);
} else if ($this->arg('group_id')) {
// This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used
// overrides screen_name even if it does not get used
if (is_numeric($this->arg('group_id'))) {
return User_group::staticGet('id', $this->arg('group_id'));
}

2
lib/apiauth.php
View File

@ -87,7 +87,7 @@ class ApiAuthAction extends ApiAction
}
/**
* Check for a user specified via HTTP basic auth. If there isn't
* Check for a user specified via HTTP basic auth. If there is not
* one, try to get one by outputting the basic auth header.
*
* @return boolean true or false

6
lib/dberroraction.php
View File

@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/servererroraction.php';
*
* This only occurs if there's been a DB_DataObject_Error that's
* reported through PEAR, so we try to avoid doing anything that connects
* to the DB, so we don't trigger it again.
* to the DB, so we do not trigger it again.
*
* @category Action
* @package StatusNet
@ -62,12 +62,12 @@ class DBErrorAction extends ServerErrorAction
function getLanguage()
{
// Don't try to figure out user's language; just show the page
// Do not try to figure out user's language; just show the page
return common_config('site', 'language');
}
function showPrimaryNav()
{
// don't show primary nav
// do not show primary nav
}
}

4
lib/error.php
View File

@ -104,11 +104,11 @@ class ErrorAction extends Action
{
parent::showPage();
// We don't want to have any more output after this
// We do not want to have any more output after this
exit();
}
// Overload a bunch of stuff so the page isn't too bloated
// Overload a bunch of stuff so the page is not too bloated
function showBody()
{

2
lib/htmloutputter.php
View File

@ -76,7 +76,7 @@ class HTMLOutputter extends XMLOutputter
/**
* Start an HTML document
*
* If $type isn't specified, will attempt to do content negotiation.
* If $type is not specified, will attempt to do content negotiation.
*
* Attempts to do content negotiation for language, also.
*

2
lib/imagefile.php
View File

@ -119,7 +119,7 @@ class ImageFile
return;
}
// Don't crop/scale if it isn't necessary
// Do not crop/scale if it is not necessary
if ($size === $this->width
&& $size === $this->height
&& $x === 0

2
lib/jabber.php
View File

@ -437,7 +437,7 @@ function jabber_public_notice($notice)
$public = common_config('xmpp', 'public');
// FIXME PRIV don't send out private messages here
// FIXME PRIV do not send out private messages here
// XXX: should we send out non-local messages if public,localonly
// = false? I think not

6
lib/mail.php
View File

@ -467,7 +467,7 @@ function mail_notify_nudge($from, $to)
"these days and is inviting you to post some news.\n\n".
"So let's hear from you :)\n\n".
"%3\$s\n\n".
"Don't reply to this email; it won't get to them.\n\n".
"Do not reply to this email. It will not get to them.\n\n".
"With kind regards,\n".
"%4\$s\n"),
$from_profile->getBestName(),
@ -516,7 +516,7 @@ function mail_notify_message($message, $from=null, $to=null)
"------------------------------------------------------\n\n".
"You can reply to their message here:\n\n".
"%4\$s\n\n".
"Don't reply to this email; it won't get to them.\n\n".
"Do not reply to this email. It will not get to them.\n\n".
"With kind regards,\n".
"%5\$s\n"),
$from_profile->getBestName(),
@ -532,7 +532,7 @@ function mail_notify_message($message, $from=null, $to=null)
/**
* notify a user that one of their notices has been chosen as a 'fave'
*
* Doesn't check that the user has an email address nor if they
* Does not check that the user has an email address nor if they
* want to receive notification of faves. Maybe this happens higher
* up the stack...?
*

4
lib/noticelist.php
View File

@ -347,7 +347,7 @@ class NoticeListItem extends Widget
* show the link to the main page for the notice
*
* Displays a link to the page for a notice, with "relative" time. Tries to
* get remote notice URLs correct, but doesn't always succeed.
* get remote notice URLs correct, but does not always succeed.
*
* @return void
*/
@ -483,7 +483,7 @@ class NoticeListItem extends Widget
* show a link to reply to the current notice
*
* Should either do the reply in the current notice form (if available), or
* link out to the notice-posting form. A little flakey, doesn't always work.
* link out to the notice-posting form. A little flakey, does not always work.
*
* @return void
*/

4
lib/oauthstore.php
View File

@ -351,7 +351,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$author = User::staticGet('uri', $author_uri);
}
if (!$author) {
throw new Exception('No such user');
throw new Exception('No such user.');
}
common_log(LOG_DEBUG, print_r($author, true), __FILE__);
@ -407,7 +407,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$user = User::staticGet('uri', $uri);
}
if (!$user) {
throw new Exception('No such user');
throw new Exception('No such user.');
}
return $user;
}

12
lib/queuehandler.php
View File

@ -96,8 +96,8 @@ class QueueHandler extends Daemon
* Initialization, run when the queue handler starts.
* If this function indicates failure, the handler run will be aborted.
*
* @fixme run() will abort if this doesn't return true,
* but some subclasses don't bother.
* @fixme run() will abort if this does not return true,
* but some subclasses do not bother.
* @return boolean true on success, false on failure
*/
function start()
@ -108,8 +108,8 @@ class QueueHandler extends Daemon
* Cleanup, run when the queue handler ends.
* If this function indicates failure, a warning will be logged.
*
* @fixme run() will throw warnings if this doesn't return true,
* but many subclasses don't bother.
* @fixme run() will throw warnings if this does not return true,
* but many subclasses do not bother.
* @return boolean true on success, false on failure
*/
function finish()
@ -137,7 +137,7 @@ class QueueHandler extends Daemon
* method, which passes control back to our handle_notice() method for
* each notice that comes in on the queue.
*
* Most of the time this won't need to be overridden in a subclass.
* Most of the time this will not need to be overridden in a subclass.
*
* @return boolean true on success, false on failure
*/
@ -173,7 +173,7 @@ class QueueHandler extends Daemon
* Called by QueueHandler after each handled item or empty polling cycle.
* This is a good time to e.g. service your XMPP connection.
*
* Doesn't need to be overridden if there's no maintenance to do.
* Does not need to be overridden if there's no maintenance to do.
*
* @param int $timeout seconds to sleep if there's nothing to do
*/

2
lib/rssaction.php
View File

@ -386,7 +386,7 @@ class Rss10Action extends Action
return null;
}
// FIXME: doesn't handle modified profiles, avatars, deleted notices
// FIXME: does not handle modified profiles, avatars, deleted notices
return strtotime($this->notices[0]->created);
}

2
lib/search_engines.php
View File

@ -119,7 +119,7 @@ class MySQLSearch extends SearchEngine
return true;
} else if ('identica_notices' === $this->table) {
// Don't show imported notices
// Do not show imported notices
$this->target->whereAdd('notice.is_local != ' . Notice::GATEWAY);
if (strtolower($q) != $q) {

12
lib/util.php
View File

@ -62,7 +62,7 @@ function common_init_language()
$locale_set = common_init_locale($language);
setlocale(LC_CTYPE, 'C');
// So we don't have to make people install the gettext locales
// So we do not have to make people install the gettext locales
$path = common_config('site','locale_path');
bindtextdomain("statusnet", $path);
bind_textdomain_codeset("statusnet", "UTF-8");
@ -139,7 +139,7 @@ function common_check_user($nickname, $password)
}
}
}else{
//no handler indicated the credentials were valid, and we know their not valid because the user isn't in the database
//no handler indicated the credentials were valid, and we know their not valid because the user is not in the database
return false;
}
} else {
@ -396,7 +396,7 @@ function common_current_user()
}
// Logins that are 'remembered' aren't 'real' -- they're subject to
// cookie-stealing. So, we don't let them do certain things. New reg,
// cookie-stealing. So, we do not let them do certain things. New reg,
// OpenID, and password logins _are_ real.
function common_real_login($real=true)
@ -1147,7 +1147,7 @@ function common_accept_to_prefs($accept, $def = '*/*')
$parts = explode(',', $accept);
foreach($parts as $part) {
// FIXME: doesn't deal with params like 'text/html; level=1'
// FIXME: does not deal with params like 'text/html; level=1'
@list($value, $qpart) = explode(';', trim($part));
$match = array();
if(!isset($qpart)) {
@ -1346,7 +1346,7 @@ function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
}
// FIXME: show error page if we're on the Web
/* Don't execute PHP internal error handler */
/* Do not execute PHP internal error handler */
return true;
}
@ -1448,7 +1448,7 @@ function common_shorten_url($long_url)
}
global $_shorteners;
if (!isset($_shorteners[$svc])) {
//the user selected service doesn't exist, so default to ur1.ca
//the user selected service does not exist, so default to ur1.ca
$svc = 'ur1.ca';
}
if (!isset($_shorteners[$svc])) {

2
lib/xmloutputter.php
View File

@ -112,7 +112,7 @@ class XMLOutputter
*
* Utility for outputting an XML element. A convenient wrapper
* for a bunch of longer XMLWriter calls. This is best for
* when an element doesn't have any sub-elements; if that's the
* when an element does not have any sub-elements; if that's the
* case, use elementStart() and elementEnd() instead.
*
* The $content element will be escaped for XML. If you need

2
lib/xmppqueuehandler.php
View File

@ -37,7 +37,7 @@ class XmppQueueHandler extends QueueHandler
function start()
{
# Low priority; we don't want to receive messages
# Low priority; we do not want to receive messages
$this->log(LOG_INFO, "INITIALIZE");
$this->conn = jabber_connect($this->_id.$this->transport());

BIN
locale/bg/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11144
locale/bg/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/ca/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11339
locale/ca/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/cs/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11055
locale/cs/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/de/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11318
locale/de/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/el/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

10843
locale/el/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/en_GB/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11002
locale/en_GB/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/es/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11568
locale/es/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/fi/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11329
locale/fi/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/fr/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11426
locale/fr/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/ga/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11831
locale/ga/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/he/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11015
locale/he/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/is/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11032
locale/is/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/it/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

11203
locale/it/LC_MESSAGES/statusnet.po
View File

File diff suppressed because it is too large Load Diff

BIN
locale/ja/LC_MESSAGES/statusnet.mo
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More