Added i18n text for @title values in geo sharing actions

diff --git a/js/util.js b/js/util.js
index 4e588a3b63be4fec58ac801baddaa33834880cdc..0314668d9d753117182db9b0075d02978116bf8e 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -480,7 +480,7 @@ var SN = { // StatusNet
             var NDGe = $('#'+SN.C.S.NoticeDataGeo);
 
             function removeNoticeDataGeo() {
-                $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked');
+                $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked').attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()));
                 $('#'+SN.C.S.NoticeDataGeoSelected).hide();
 
                 $('#'+SN.C.S.NoticeLat).val('');
@@ -566,7 +566,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');
+                        $('label[for='+SN.C.S.NoticeDataGeo+']').addClass('checked').attr('title', NoticeDataGeoShareDisable_text);
 
                         var S = '<div id="'+SN.C.S.NoticeDataGeoSelected+'" class="'+SN.C.S.Success+'"/>';
                         var NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
@@ -579,7 +579,7 @@ var SN = { // StatusNet
                         }
 
                         NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
-                        NDGS.prepend('<span id="'+SN.C.S.NoticeGeoName+'">Geo</span> <button class="minimize">&#95;</button> <button class="close">&#215;</button>');
+                        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>');
 
                         var NLN = $('#'+SN.C.S.NoticeGeoName);
                         NLN.addClass('processing');

diff --git a/lib/noticeform.php b/lib/noticeform.php
index ddfe450556d45775c872a46f79fb7bf698b34d12..f0b704e876747e751f17a0a0fc5e00c35299766a 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -209,8 +209,10 @@ class NoticeForm extends Form
 
                 $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap',
                                                       'title' => common_local_url('geocode')));
-                $this->out->checkbox('notice_data-geo', _('Share your location'), true);
+                $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').'";');
             }
 
             Event::handle('EndShowNoticeFormData', array($this));