Using a JSON object for NoticeDataGeo text instead

diff --git a/js/util.js b/js/util.js
index 43f4922749eb8e4c3f755d7957ee00fdd634b218..0ee3d53bd52ef0f0c47556c79c251d731b4a9d45 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -567,7 +567,7 @@ var SN = { // StatusNet
                     }
 
                     if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
-                        $('label[for='+SN.C.S.NoticeDataGeo+']').addClass('checked').attr('title', NoticeDataGeoShareDisable_text);
+                        $('label[for='+SN.C.S.NoticeDataGeo+']').addClass('checked').attr('title', NoticeDataGeo_text.ShareDisable);
 
                         var S = '<div id="'+SN.C.S.NoticeDataGeoSelected+'" class="'+SN.C.S.Success+'"/>';
                         var NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
@@ -580,7 +580,7 @@ var SN = { // StatusNet
                         }
 
                         NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
-                        NDGS.prepend('<span id="'+SN.C.S.NoticeGeoName+'">Geo</span> <button class="minimize" title="'+NoticeDataGeoInfoMinimize_text+'">&#95;</button> <button class="close" title="'+NoticeDataGeoShareDisable_text+'">&#215;</button>');
+                        NDGS.prepend('<span id="'+SN.C.S.NoticeGeoName+'">Geo</span> <button class="minimize" title="'+NoticeDataGeo_text.InfoMinimize+'">&#95;</button> <button class="close" title="'+NoticeDataGeo_text.ShareDisable+'">&#215;</button>');
 
                         var NLN = $('#'+SN.C.S.NoticeGeoName);
                         NLN.addClass('processing');

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 02e35a8d79bd50d16e26d6a7806499ca011c31db..41504b7356b4cfcc6f3f56f28806aa1d21176c76 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -211,8 +211,10 @@ 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').'"'.
+                    '}');
             }
 
             Event::handle('EndShowNoticeFormData', array($this));