diff options
| -rw-r--r-- | data/templates/editbookmark.tpl.php | 28 | ||||
| -rw-r--r-- | doc/ChangeLog | 2 |
2 files changed, 22 insertions, 8 deletions
diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index c58bd1b..dd6b100 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -140,14 +140,26 @@ if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) { <p> <script type="text/javascript"> var browser=navigator.appName; -if (browser == "Opera") - { - document.write('<?php echo sprintf(T_("Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s"), jsEscTitle($GLOBALS['sitename'])); ?>:</p>'); - } -else - { - document.write('<?php echo sprintf(T_("Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s"), jsEscTitle($GLOBALS['sitename'])); ?>:</p>'); - } +if (browser == "Opera") { + document.write( + <?php echo json_encode( + sprintf( + T_("Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s"), + $GLOBALS['sitename'] + ) + ); ?> + ':</p>' + ); +} else { + document.write( + <?php echo json_encode( + sprintf( + T_("Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s"), + $GLOBALS['sitename'] + ) + ); + ?> + ':</p>' + ); +} var selection = ''; if (window.getSelection) { selection = 'window.getSelection()'; diff --git a/doc/ChangeLog b/doc/ChangeLog index 48ca425..5925a85 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -4,6 +4,8 @@ ChangeLog for SemantiScuttle 0.97.2 - 2011-02-XX ------------------- - Fix bug #3178597: Broken link to context in gsearch admin index page +- Fix bug #3074816: French translation breaks edit javascript + This also fixes #3094047 and #3178592 0.97.1 - 2010-09-30 |