aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/editbookmark.tpl.php28
-rw-r--r--doc/ChangeLog1
2 files changed, 21 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 07b1e49..2633fc8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -7,6 +7,7 @@ ChangeLog for SemantiScuttle
- Show error message on mysqli connection errors
- Implement patch #3059829: update FR_CA translation
- Fix bug #3073215: Updating bookmark time does not work
+- Fix bug #3074816: French translation breaks edit javascript
0.97.0 - 2010-06-09