Merge branch '0.9.x' into 1.0.x

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

diff --git a/lib/messageform.php b/lib/messageform.php
index e25ebfa08f29a2ecaf7a47ae17ff66156c0a34ca..b116964da9d95e9200466f45f4674eeb6579787f 100644 (file)
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -80,10 +80,21 @@ class MessageForm extends Form
     /**
      * ID of the form
      *
-     * @return int ID of the form
+     * @return string ID of the form
      */
 
     function id()
+    {
+        return 'form_notice-direct';
+    }
+
+   /**
+     * Class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
     {
         return 'form_notice';
     }
@@ -143,9 +154,6 @@ class MessageForm extends Form
 
         $contentLimit = Message::maxContent();
 
-        $this->out->element('script', array('type' => 'text/javascript'),
-                            'maxLength = ' . $contentLimit . ';');
-
         if ($contentLimit > 0) {
             $this->out->elementStart('dl', 'form_note');
             $this->out->element('dt', null, _('Available characters'));
@@ -167,6 +175,6 @@ class MessageForm extends Form
                                            'class' => 'submit',
                                            'name' => 'message_send',
                                            'type' => 'submit',
-                                           'value' => _('Send')));
+                                           'value' => _m('Send button for sending notice', 'Send')));
     }
 }