summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-01-13 15:21:43 +0000
committerSarven Capadisli <csarven@status.net>2010-01-13 15:21:43 +0000
commit9b2fdefe3925ca807ccf80339bef019306096cc6 (patch)
tree04097a2e3f4ccf092e23dac3f50d4e83e26fd633
parent543026b8d1411c7d71a6482d0649ab3523f489b8 (diff)
Using a JSON object for NoticeDataGeo text instead
-rw-r--r--js/util.js4
-rw-r--r--lib/noticeform.php6
2 files changed, 6 insertions, 4 deletions
diff --git a/js/util.js b/js/util.js
index 43f492274..0ee3d53bd 100644
--- 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 02e35a8d7..41504b735 100644
--- 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));