Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / inviteform.php

diff --git a/lib/inviteform.php b/lib/inviteform.php
index 7b3c164cc8639be912aec50a6ca8c5664de37810..be4dc163b059c56257b601f53188e08396f415e1 100644 (file)
--- a/lib/inviteform.php
+++ b/lib/inviteform.php
@@ -41,7 +41,6 @@ require_once INSTALLDIR . '/lib/form.php';
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- *
  */
 class InviteForm extends Form
 {
@@ -65,16 +64,6 @@ class InviteForm extends Form
        return 'form_invite';
     }
 
-    /**
-     * class of the form
-     *
-     * @return string of the form class
-     */
-    function formClass()
-    {
-        return 'form_settings';
-    }
-
     /**
      * Action of the form
      *
@@ -104,25 +93,37 @@ class InviteForm extends Form
     function formData()
     {
         $this->out->elementStart('ul', 'form_data');
+
         $this->out->elementStart('li');
-        // TRANS: Field label for a list of e-mail addresses.
         $this->out->textarea(
             'addresses',
+            // TRANS: Field label for a list of e-mail addresses.
             _('Email addresses'),
             $this->out->trimmed('addresses'),
-            // TRANS: Tooltip for field label for a list of e-mail addresses.
+            // TRANS: Field title for a list of e-mail addresses.
             _('Addresses of friends to invite (one per line).')
         );
         $this->out->elementEnd('li');
+
         $this->out->elementStart('li');
-        // TRANS: Field label for a personal message to send to invitees.
         $this->out->textarea(
+            // TRANS: Field label for a personal message to send to invitees.
             'personal', _('Personal message'),
             $this->out->trimmed('personal'),
-            // TRANS: Tooltip for field label for a personal message to send to invitees.
+            // TRANS: Field title for a personal message to send to invitees.
             _('Optionally add a personal message to the invitation.')
         );
         $this->out->elementEnd('li');
+
+        $language = common_language();
+
+        $this->out->elementStart('li');
+        $this->out->dropdown('language', _('Language'),
+            // TRANS: Tooltip for dropdown list label in form for profile settings.
+            get_nice_language_list(), _('Preferred language.'),
+            false, $language);
+        $this->out->elementEnd('li');
+
         $this->out->elementEnd('ul');
     }
 
@@ -133,13 +134,13 @@ class InviteForm extends Form
      */
     function formActions()
     {
-        // TRANS: Send button for inviting friends
         $this->out->submit(
             'send',
+            // TRANS: Send button for inviting friends
             _m('BUTTON','Send'), 'submit form_action-primary',
-            // TRANS: Submit button title.
             'send',
-            _('Send')
+            // TRANS: Submit button title.
+            _('Send invitations.')
         );
     }
 }