tag -> list
This commit is contained in:
parent
20f25912d4
commit
1fa689e913
@ -293,7 +293,7 @@ class OStatusPlugin extends Plugin
|
|||||||
|
|
||||||
$action->elementStart('fieldset');
|
$action->elementStart('fieldset');
|
||||||
// TRANS: Fieldset legend.
|
// TRANS: Fieldset legend.
|
||||||
$action->element('legend', null, _m('Tag remote profile'));
|
$action->element('legend', null, _m('List remote profile'));
|
||||||
$action->hidden('token', common_session_token());
|
$action->hidden('token', common_session_token());
|
||||||
|
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
@ -883,7 +883,7 @@ class OStatusPlugin extends Plugin
|
|||||||
// TRANS: Title for following a remote list.
|
// TRANS: Title for following a remote list.
|
||||||
$act->title = _m('TITLE','Follow list');
|
$act->title = _m('TITLE','Follow list');
|
||||||
// TRANS: Success message for remote list follow through OStatus.
|
// TRANS: Success message for remote list follow through OStatus.
|
||||||
// TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
|
// TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
|
||||||
$act->content = sprintf(_m('%1$s is now following people listed in %2$s by %3$s.'),
|
$act->content = sprintf(_m('%1$s is now following people listed in %2$s by %3$s.'),
|
||||||
$sub->getBestName(),
|
$sub->getBestName(),
|
||||||
$oprofile->getBestName(),
|
$oprofile->getBestName(),
|
||||||
@ -933,7 +933,7 @@ class OStatusPlugin extends Plugin
|
|||||||
// TRANS: Title for unfollowing a remote list.
|
// TRANS: Title for unfollowing a remote list.
|
||||||
$act->title = _m('Unfollow list');
|
$act->title = _m('Unfollow list');
|
||||||
// TRANS: Success message for remote list unfollow through OStatus.
|
// TRANS: Success message for remote list unfollow through OStatus.
|
||||||
// TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
|
// TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
|
||||||
$act->content = sprintf(_m('%1$s stopped following the list %2$s by %3$s.'),
|
$act->content = sprintf(_m('%1$s stopped following the list %2$s by %3$s.'),
|
||||||
$sub->getBestName(),
|
$sub->getBestName(),
|
||||||
$oprofile->getBestName(),
|
$oprofile->getBestName(),
|
||||||
@ -1284,8 +1284,8 @@ class OStatusPlugin extends Plugin
|
|||||||
array('nickname' => $profileUser->nickname));
|
array('nickname' => $profileUser->nickname));
|
||||||
$output->element('a', array('href' => $url,
|
$output->element('a', array('href' => $url,
|
||||||
'class' => 'entity_remote_tag'),
|
'class' => 'entity_remote_tag'),
|
||||||
// TRANS: Link text for a user to tag an OStatus user.
|
// TRANS: Link text for a user to list an OStatus user.
|
||||||
_m('Tag'));
|
_m('List'));
|
||||||
$output->elementEnd('li');
|
$output->elementEnd('li');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -104,7 +104,7 @@ class OStatusInitAction extends Action
|
|||||||
// TRANS: Button text to join a group.
|
// TRANS: Button text to join a group.
|
||||||
$submit = _m('BUTTON','Join');
|
$submit = _m('BUTTON','Join');
|
||||||
} else if ($this->peopletag && $this->tagger) {
|
} else if ($this->peopletag && $this->tagger) {
|
||||||
// TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
|
// TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
|
||||||
$header = sprintf(_m('Subscribe to list %1$s by %2$s'), $this->peopletag, $this->tagger);
|
$header = sprintf(_m('Subscribe to list %1$s by %2$s'), $this->peopletag, $this->tagger);
|
||||||
// TRANS: Button text to subscribe to a list.
|
// TRANS: Button text to subscribe to a list.
|
||||||
$submit = _m('BUTTON','Subscribe');
|
$submit = _m('BUTTON','Subscribe');
|
||||||
|
@ -36,8 +36,8 @@ class OStatusTagAction extends OStatusInitAction
|
|||||||
parent::prepare($args);
|
parent::prepare($args);
|
||||||
|
|
||||||
if (common_logged_in()) {
|
if (common_logged_in()) {
|
||||||
// TRANS: Client error displayed when trying to tag a local object as if it is remote.
|
// TRANS: Client error displayed when trying to list a local object as if it is remote.
|
||||||
$this->clientError(_m('You can use the local tagging!'));
|
$this->clientError(_m('You can use the local list functionality!'));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -51,9 +51,9 @@ class OStatusTagAction extends OStatusInitAction
|
|||||||
|
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
// TRANS: Header for tagging a remote object. %s is a remote object's name.
|
// TRANS: Header for listing a remote object. %s is a remote object's name.
|
||||||
$header = sprintf(_m('Tag %s'), $this->nickname);
|
$header = sprintf(_m('List %s'), $this->nickname);
|
||||||
// TRANS: Button text to tag a remote object.
|
// TRANS: Button text to list a remote object.
|
||||||
$submit = _m('BUTTON','Go');
|
$submit = _m('BUTTON','Go');
|
||||||
$this->elementStart('form', array('id' => 'form_ostatus_connect',
|
$this->elementStart('form', array('id' => 'form_ostatus_connect',
|
||||||
'method' => 'post',
|
'method' => 'post',
|
||||||
@ -68,7 +68,7 @@ class OStatusTagAction extends OStatusInitAction
|
|||||||
// TRANS: Field label.
|
// TRANS: Field label.
|
||||||
$this->input('nickname', _m('User nickname'), $this->nickname,
|
$this->input('nickname', _m('User nickname'), $this->nickname,
|
||||||
// TRANS: Field title.
|
// TRANS: Field title.
|
||||||
_m('Nickname of the user you want to tag.'));
|
_m('Nickname of the user you want to list.'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
$this->elementStart('li', array('id' => 'ostatus_profile'));
|
$this->elementStart('li', array('id' => 'ostatus_profile'));
|
||||||
// TRANS: Field label.
|
// TRANS: Field label.
|
||||||
|
@ -201,12 +201,12 @@ class UsersalmonAction extends SalmonAction
|
|||||||
|
|
||||||
if (empty($tagged)) {
|
if (empty($tagged)) {
|
||||||
// TRANS: Client exception.
|
// TRANS: Client exception.
|
||||||
throw new ClientException(_m('Unidentified profile being tagged.'));
|
throw new ClientException(_m('Unidentified profile being listed.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($tagged->id !== $this->user->id) {
|
if ($tagged->id !== $this->user->id) {
|
||||||
// TRANS: Client exception.
|
// TRANS: Client exception.
|
||||||
throw new ClientException(_m('This user is not the one being tagged.'));
|
throw new ClientException(_m('This user is not the one being listed.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// save the list
|
// save the list
|
||||||
@ -217,7 +217,7 @@ class UsersalmonAction extends SalmonAction
|
|||||||
$result = Profile_tag::setTag($ptag->tagger, $tagged->id, $ptag->tag);
|
$result = Profile_tag::setTag($ptag->tagger, $tagged->id, $ptag->tag);
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
// TRANS: Client exception.
|
// TRANS: Client exception.
|
||||||
throw new ClientException(_m('The tag could not be saved.'));
|
throw new ClientException(_m('The listing could not be saved.'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -235,12 +235,12 @@ class UsersalmonAction extends SalmonAction
|
|||||||
|
|
||||||
if (empty($tagged)) {
|
if (empty($tagged)) {
|
||||||
// TRANS: Client exception.
|
// TRANS: Client exception.
|
||||||
throw new ClientException(_m('Unidentified profile being untagged.'));
|
throw new ClientException(_m('Unidentified profile being unlisted.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($tagged->id !== $this->user->id) {
|
if ($tagged->id !== $this->user->id) {
|
||||||
// TRANS: Client exception.
|
// TRANS: Client exception.
|
||||||
throw new ClientException(_m('This user is not the one being untagged.'));
|
throw new ClientException(_m('This user is not the one being unlisted.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// save the list
|
// save the list
|
||||||
@ -252,7 +252,7 @@ class UsersalmonAction extends SalmonAction
|
|||||||
|
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
// TRANS: Client exception.
|
// TRANS: Client exception.
|
||||||
throw new ClientException(_m('The tag could not be deleted.'));
|
throw new ClientException(_m('The listing could not be deleted.'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -181,13 +181,13 @@ class SalmonAction extends Action
|
|||||||
function handleTag()
|
function handleTag()
|
||||||
{
|
{
|
||||||
// TRANS: Client exception.
|
// TRANS: Client exception.
|
||||||
throw new ClientException(_m('This target does not understand tag events.'));
|
throw new ClientException(_m('This target does not understand list events.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleUntag()
|
function handleUntag()
|
||||||
{
|
{
|
||||||
// TRANS: Client exception.
|
// TRANS: Client exception.
|
||||||
throw new ClientException(_m('This target does not understand untag events.'));
|
throw new ClientException(_m('This target does not understand unlist events.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user