Commit a034fb0b authored by Brion Vibber's avatar Brion Vibber

Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"

This reverts commit 81b4a381.
IMO "user" is a bit impersonal and we shouldn't go changing the tone of the UI willy-nilly when we're updating localisations.
parent 111f6a77
......@@ -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);
}
......
......@@ -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');
......
......@@ -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');
......
......@@ -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');
......
......@@ -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".
......
......@@ -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
{
......
......@@ -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');
......
......@@ -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.');
}
......
......@@ -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;
}
......
......@@ -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()
......
......@@ -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
......@@ -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]'.
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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;
}
......
......@@ -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));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment