Fix bug #3074816: French translation breaks edit javascript

  Also fixes #3094047 and #3178592

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@757 b3834d28-1941-0410-a4f8-b48e95affb8f
(cherry picked from commit f0456530b4940918efba25ea15e22532c682fb70)

Conflicts:

	doc/ChangeLog

diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php
index c58bd1b5fdc5dae24375eaaf20e88c08eeb6e36a..dd6b10039555d8dc3fa72d44b40f5fd78859666a 100644 (file)
--- 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 48ca4257f7308b2b2e082b5ec6b4482de68f70c0..5925a8542603af67d2c2d9564b9142a58a8a9a9d 100644 (file)
--- 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