X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Factions%2Fostatusinit.php;h=78c559e5799146dc0f26ca040a603f9365da469c;hb=2e4ec0df0ecc4fc8e41dea46ddfe4bd1796208ff;hp=341fdec629675dba997ed53e18035cb7d6429174;hpb=67db18d30b9c1a8aa5d03bae38839e4294974d9b;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php index 341fdec629..78c559e579 100644 --- a/plugins/OStatus/actions/ostatusinit.php +++ b/plugins/OStatus/actions/ostatusinit.php @@ -22,13 +22,15 @@ * @maintainer James Walker */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - +if (!defined('STATUSNET')) { + exit(1); +} class OStatusInitAction extends Action { - var $nickname; + var $tagger; + var $peopletag; var $group; var $profile; var $err; @@ -38,20 +40,23 @@ class OStatusInitAction extends Action parent::prepare($args); if (common_logged_in()) { + // TRANS: Client error. $this->clientError(_m('You can use the local subscription!')); return false; } // Local user or group the remote wants to subscribe to $this->nickname = $this->trimmed('nickname'); + $this->tagger = $this->trimmed('tagger'); + $this->peopletag = $this->trimmed('peopletag'); $this->group = $this->trimmed('group'); - + // Webfinger or profile URL of the remote user $this->profile = $this->trimmed('profile'); return true; } - + function handle($args) { parent::handle($args); @@ -60,6 +65,7 @@ class OStatusInitAction extends Action /* Use a session token for CSRF protection. */ $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { + // TRANS: Client error displayed when the session token does not match or is not given. $this->showForm(_m('There was a problem with your session token. '. 'Try again, please.')); return; @@ -69,7 +75,7 @@ class OStatusInitAction extends Action $this->showForm(); } } - + function showForm($err = null) { $this->err = $err; @@ -78,7 +84,8 @@ class OStatusInitAction extends Action $this->xw->startDocument('1.0', 'UTF-8'); $this->elementStart('html'); $this->elementStart('head'); - $this->element('title', null, _m('Subscribe to user')); + // TRANS: Form title. + $this->element('title', null, _m('TITLE','Subscribe to user')); $this->elementEnd('head'); $this->elementStart('body'); $this->showContent(); @@ -91,15 +98,23 @@ class OStatusInitAction extends Action function showContent() { - - $this->clientError(_m("With GNU social, users do not use one server to communicate in the way that Facebook and Twitter users do. Instead, users are spread out over a network of servers and different sites. You can run your own server, or you can sign up for one of the public servers — it doesn't even need to be a GNU social server — any server that speaks the OStatus protocol is suitable. A good place to get an account for yourself is www.status.net")); if ($this->group) { + // TRANS: Form legend. %s is a group name. $header = sprintf(_m('Join group %s'), $this->group); - $submit = _m('Join'); + // TRANS: Button text to join a group. + $submit = _m('BUTTON','Join'); + } else if ($this->peopletag && $this->tagger) { + // TRANS: Form legend. %1$s is a list, %2$s is a tagger's name. + $header = sprintf(_m('Subscribe to list %1$s by %2$s'), $this->peopletag, $this->tagger); + // TRANS: Button text to subscribe to a list. + $submit = _m('BUTTON','Subscribe'); + // TRANS: Button text. } else { + // TRANS: Form legend. %s is a nickname. $header = sprintf(_m('Subscribe to %s'), $this->nickname); - $submit = _m('Subscribe'); + // TRANS: Button text to subscribe to a profile. + $submit = _m('BUTTON','Subscribe'); } $this->elementStart('form', array('id' => 'form_ostatus_connect', 'method' => 'post', @@ -111,13 +126,27 @@ class OStatusInitAction extends Action $this->elementStart('ul', 'form_data'); $this->elementStart('li', array('id' => 'ostatus_nickname')); - $this->input('nickname', _m('User nickname'), $this->nickname, - _m('Nickname of the user you want to follow')); - $this->hidden('group', $this->group); // pass-through for magic links + + if ($this->group) { + // TRANS: Field label. + $this->input('group', _m('Group nickname'), $this->group, + // TRANS: Field title. + _m('Nickname of the group you want to join.')); + } else { + // TRANS: Field label. + $this->input('nickname', _m('User nickname'), $this->nickname, + // TRANS: Field title. + _m('Nickname of the user you want to follow.')); + $this->hidden('tagger', $this->tagger); + $this->hidden('peopletag', $this->peopletag); + } + $this->elementEnd('li'); $this->elementStart('li', array('id' => 'ostatus_profile')); + // TRANS: Field label. $this->input('profile', _m('Profile Account'), $this->profile, - _m('Your account id (i.e. user@identi.ca)')); + // TRANS: Tooltip for field label "Profile Account". + _m('Your account ID (e.g. user@identi.ca).')); $this->elementEnd('li'); $this->elementEnd('ul'); $this->submit('submit', $submit); @@ -138,7 +167,8 @@ class OStatusInitAction extends Action } elseif (strpos($this->profile, '@') !== false) { $this->connectWebfinger($this->profile); } else { - $this->clientError(_m("Must provide a remote profile.")); + // TRANS: Client error. + $this->clientError(_m('Must provide a remote profile.')); } } @@ -149,7 +179,8 @@ class OStatusInitAction extends Action $disco = new Discovery; $result = $disco->lookup($acct); if (!$result) { - $this->clientError(_m("Couldn't look up OStatus account profile.")); + // TRANS: Client error. + $this->clientError(_m('Could not look up OStatus account profile.')); } foreach ($result->links as $link) { @@ -161,7 +192,8 @@ class OStatusInitAction extends Action } } - $this->clientError(_m("Couldn't confirm remote profile address.")); + // TRANS: Client error. + $this->clientError(_m('Could not confirm remote profile address.')); } function connectProfile($subscriber_profile) @@ -186,25 +218,40 @@ class OStatusInitAction extends Action if ($user) { return common_local_url('userbyid', array('id' => $user->id)); } else { - $this->clientError("No such user."); + // TRANS: Client error. + $this->clientError(_m('No such user.')); } } else if ($this->group) { $group = Local_group::staticGet('nickname', $this->group); if ($group) { return common_local_url('groupbyid', array('id' => $group->group_id)); } else { - $this->clientError("No such group."); + // TRANS: Client error. + $this->clientError(_m('No such group.')); } + } else if ($this->peopletag && $this->tagger) { + $user = User::staticGet('nickname', $this->tagger); + if (empty($user)) { + // TRANS: Client error. + $this->clientError(_m('No such user.')); + } + + $peopletag = Profile_list::getByTaggerAndTag($user->id, $this->peopletag); + if ($peopletag) { + return common_local_url('profiletagbyid', + array('tagger_id' => $user->id, 'id' => $peopletag->id)); + } + // TRANS: Client error. + $this->clientError(_m('No such list.')); } else { - $this->clientError("No local user or group nickname provided."); + // TRANS: Client error. + $this->clientError(_m('No local user or group nickname provided.')); } } function title() { - return _m('OStatus Connect'); + // TRANS: Page title. + return _m('OStatus Connect'); } - - - }