GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2010-11-19 12:00:42 -08:00
commit 834acaaa79
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/messageform.php
View File

@ -133,6 +133,8 @@ class MessageForm extends Form
$mutual_users = $user->mutuallySubscribedUsers(); $mutual_users = $user->mutuallySubscribedUsers();
$mutual = array(); $mutual = array();
// TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
$mutual[0] = _('Select recipient:');
while ($mutual_users->fetch()) { while ($mutual_users->fetch()) {
if ($mutual_users->id != $user->id) { if ($mutual_users->id != $user->id) {
@ -143,6 +145,11 @@ class MessageForm extends Form
$mutual_users->free(); $mutual_users->free();
unset($mutual_users); unset($mutual_users);
if (count($mutual) == 1) {
// TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
$mutual[0] = _('No mutual subscribers.');
}
$this->out->dropdown('to', _('To'), $mutual, null, false, $this->out->dropdown('to', _('To'), $mutual, null, false,
($this->to) ? $this->to->id : null); ($this->to) ? $this->to->id : null);