if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
- $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
+ $message .= _('Try subscribing to more users, [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);
}
$person = $this->showMicrobloggingAccount($this->profile,
common_root_url(), $this->user->uri, false);
- // Get people who subscribe to user
+ // Get users who subscribe to user
$sub = new Subscription();
$sub->subscribed = $this->profile->id;
if ($isSubscriber) {
$this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct'));
} else {
- // Get people user is subscribed to
+ // Get users user is subscribed to
$sub = new Subscription();
$sub->subscriber = $profile->id;
$sub->whereAdd('subscriber != subscribed');
{
$notice =
sprintf(_('%%%%site.name%%%% groups let you find and talk with ' .
- 'people of similar interests. After you join a group ' .
+ 'users of similar interests. After you join a group ' .
'you can send messages to all other members using the ' .
- 'syntax "!groupname". Don\'t see a group you like? Try ' .
+ 'syntax "!groupname". Are you not seeing any groups ' .
+ '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');
$this->elementStart('li');
$this->checkbox('jabberreplies',
_('Send me replies through Jabber/GTalk '.
- 'from people I\'m not subscribed to.'),
+ 'from users I am not subscribed to.'),
$user->jabberreplies);
$this->elementEnd('li');
$this->elementStart('li');
$this->elementEnd('ul');
}
if ($this->subbed) {
- $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
+ $this->element('p', null, _('These 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));
$this->elementEnd('ul');
}
if ($this->sent) {
- $this->element('p', null, _('Invitation(s) sent to the following people:'));
+ $this->element('p', null, _('Invitation(s) sent to the following e-mail addresses:'));
$this->elementStart('ul');
foreach ($this->sent as $other) {
$this->element('li', null, $other);
$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 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".
+ "%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".
"%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".
* @author Robin Millette <millette@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
- * @todo common parent for people and content search?
+ * @todo common parent for user and content search?
*/
class NoticesearchAction extends SearchAction
{
$short_name = '';
if ($type == 'people') {
$type = 'peoplesearch';
- $short_name = _('People Search');
+ $short_name = _('User Search');
} else {
$type = 'noticesearch';
$short_name = _('Notice Search');
{
function getInstructions()
{
- return _('Search for people on %%site.name%% by their name, location, or interests. ' .
+ return _('Search for users on %%site.name%% by their name, location, or interests. ' .
'Separate the terms by spaces; they must be 3 characters or more.');
}
$this->tag = $this->trimmed('tag');
if (!common_valid_profile_tag($this->tag)) {
- $this->clientError(sprintf(_('Not a valid people tag: %s'),
+ $this->clientError(sprintf(_('Not a valid user tag: %s'),
$this->tag));
return;
}
function getInstructions()
{
- return _('You can update your personal profile info here '.
- 'so people know more about you.');
+ return _('You can update your personal profile info here ' .
+ 'so readers know more about you.');
}
function showScripts()
}
if (common_config('site', 'inviteonly') && empty($this->code)) {
- $this->clientError(_('Sorry, only invited people can register.'));
+ $this->clientError(_('Sorry. Only those invited can register.'));
return false;
}
if (!empty($this->code)) {
$this->invite = Invitation::staticGet('code', $this->code);
if (empty($this->invite)) {
- $this->clientError(_('Sorry, invalid invitation code.'));
+ $this->clientError(_('Sorry. This is an invalid invitation code.'));
return false;
}
// Store this in case we need it
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
- $this->clientError(_('Sorry, only invited people can register.'));
+ $this->clientError(_('Sorry. Only those invited can register.'));
return;
}
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
- $this->clientError(_('Sorry, only invited people can register.'));
+ $this->clientError(_('Sorry. Only those invited can register.'));
return;
}
'(%%%%action.imsettings%%%%) '.
'so you can send notices '.
'through instant messages.' . "\n" .
- '* [Search for people](%%%%action.peoplesearch%%%%) '.
+ '* [Search for users](%%%%action.peoplesearch%%%%) '.
'that you may know or '.
'that share your interests. ' . "\n" .
'* Update your [profile settings]'.
function showEmptyListMessage()
{
- $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) . ' ';
+ $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) . ' ';
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 people or [join groups](%%action.groups%%).');
+ $message .= _('You can engage other users in a conversation, subscribe to more users 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);
}
$user =& common_current_user();
if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null,
- _('These are the people who listen to '.
+ _('These are the users who have subscribed to '.
'your notices.'));
} else {
$this->element('p', null,
- sprintf(_('These are the people who '.
- 'listen to %s\'s notices.'),
+ sprintf(_('These are the users who '.
+ 'have subscribed to %s\'s notices.'),
$this->profile->nickname));
}
}
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
- $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor');
+ $message = _('You have no subscribers. Try subscribing to users you know and they might return the favor');
} else {
$message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
}
$user =& common_current_user();
if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null,
- _('These are the people whose notices '.
- 'you listen to.'));
+ _('These are the users whose notices '.
+ 'you have subscribed to.'));
} else {
$this->element('p', null,
- sprintf(_('These are the people whose '.
- 'notices %s listens to.'),
+ sprintf(_('These are the users whose '.
+ 'notices %s has subscribed to.'),
$this->profile->nickname));
}
}
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
- $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.');
+ $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.');
} else {
$message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
}
!Subscription::pkeyGet(array('subscriber' => $this->profile->id,
'subscribed' => $user->id)))
{
- $this->clientError(_('You can only tag people you are subscribed to or who are subscribed to you.'));
+ $this->clientError(_('You can only tag users you are subscribed to or who are subscribed to you.'));
return;
}
_('Help'), _('Help me!'), false, 'nav_help');
if ($user || !common_config('site', 'private')) {
$this->menuItem(common_local_url('peoplesearch'),
- _('Search'), _('Search for people or text'), false, 'nav_search');
+ _('Search'), _('Search for users or text'), false, 'nav_search');
}
Event::handle('EndPrimaryNav', array($this));
}
projects / quix0rs-gnu-social.git / commitdiff