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

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 02e35a8d7..a00615ce7 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -211,8 +211,11 @@ class NoticeForm extends Form
                                                       'title' => common_local_url('geocode')));
                 $this->out->checkbox('notice_data-geo', _('Share my location'), true);
                 $this->out->elementEnd('div');
-                $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location').'";'.
-                ' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";');
+                $this->out->inlineScript(' var NoticeDataGeo_text = {'.
+                    'ShareDisable: "'._('Do not share my location').'",'.
+                    'InfoMinimize: "'._('Hide this info').'",'.
+                    'ErrorTimeout: "'._('Sorry, retrieving your geo location is taking longer than expected, please try again later').'"'.
+                    '}');
             }
 
             Event::handle('EndShowNoticeFormData', array($this));