eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

Browse Source 
Conflicts:
	actions/public.php
This commit is contained in:
Ian Denhardt
2011-03-15 12:42:58 -04:00
parent 9182481edd 7f4a9c4145
commit 27ef3b1d90
1779 changed files with 148840 additions and 140433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/OStatus/actions/ostatusinit.php
View File

@@ -115,10 +115,15 @@ class OStatusInitAction extends Action
$this->elementStart('ul', 'form_data');
$this->elementStart('li', array('id' => 'ostatus_nickname'));
// TRANS: Field label.
$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,
_m('Nickname of the group you want to join.'));
} else {
// TRANS: Field label.
$this->input('nickname', _m('User nickname'), $this->nickname,
_m('Nickname of the user you want to follow.'));
}
$this->elementEnd('li');
$this->elementStart('li', array('id' => 'ostatus_profile'));
// TRANS: Field label.