Merge branch '0.9.x' into 1.0.x

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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 62df5c94100c6b2db4b7d1a2a7386b5653f86e74..a55839de0ba8c6f1e22f5f28cae60cd594bac7b2 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -189,10 +189,14 @@ class NoticeForm extends Form
             }
 
             if (common_config('attachments', 'uploads')) {
-                $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
+                $this->out->element('label', array('id' => 'notice_data-attach-label',
+                                                   'class' => 'attach-label',
+                                                   'for' => 'notice_data-attach'),
+                                                   _('Attach'));
                 $this->out->element('input', array('id' => 'notice_data-attach',
+                                                   'class' => 'attach',
                                                    'type' => 'file',
-                                                   'name' => 'attach',
+                                                   'name' => 'attach0',
                                                    'title' => _('Attach a file')));
                 $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
             }
@@ -212,8 +216,10 @@ class NoticeForm extends Form
                 $this->out->checkbox('notice_data-geo', _('Share my location'), true);
                 $this->out->elementEnd('div');
                 $this->out->inlineScript(' var NoticeDataGeo_text = {'.
-                    'ShareDisable: "'._('Do not share my location').'",'.
-                    'ErrorTimeout: "'._('Sorry, retrieving your geo location is taking longer than expected, please try again later').'"'.
+                    'ShareDisable: ' .json_encode(_('Do not share my location')).','.
+                    'ErrorTimeout: ' .json_encode(_('Sorry, retrieving your geo location is taking longer than expected, please try again later')).
+                    '} ; var NoticeAttachment_text = {'.
+                    'AttachFile: ' . json_encode(_('Attach a file')) .
                     '}');
             }
 
@@ -233,6 +239,6 @@ class NoticeForm extends Form
                                            'class' => 'submit',
                                            'name' => 'status_submit',
                                            'type' => 'submit',
-                                           'value' => _('Send')));
+                                           'value' => _m('Send button for sending notice', 'Send')));
     }
 }