Attachment 17035 Details for Bug 8942 – [3.8.x] Bug 8942: Translation process breaks javascript (followup 2)

[patch] [3.8.x] Bug 8942: Translation process breaks javascript (followup 2)

3-8-x-Bug-8942-Translation-process-breaks-javascript-fu2.patch (text/plain), 9.13 KB, created by Fridolin Somers on 2013-03-29 14:36:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fridolin Somers

Created: 2013-03-29 14:36:59 UTC

Size: 9.13 KB

patch

obsolete

>From 85365f61f4dc81ae3fc28d92e6b676fccaffffeb Mon Sep 17 00:00:00 2001
>From: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
>Date: Wed, 28 Nov 2012 17:51:03 +0100
>Subject: [PATCH 3/3] Bug 8942: Translation process breaks javascript
> (followup 2)
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Tested all changes. Functionality is unchanged. Thanks for the taking
>the extra effort to move alert strings into variables.
>Signed-off-by: Mason James <mtj@kohaaloha.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc       |    7 ++++++-
> .../intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt  |    4 +++-
> .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt    |    8 +++++---
> koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc        |    2 ++
> koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc              |    2 +-
> koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt            |    2 +-
> 6 files changed, 18 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>index 3aa3139..a945bae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>@@ -10,6 +10,11 @@
> 			window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
> 		} 
> 	}
>+    function PopupZ3950Confirmed() {
>+        if (confirm(_("Please note that this Z39.50 search could replace the current record."))){
>+            PopupZ3950();
>+        }
>+    }
> 
> 	/* provide Z3950 search points */
> 	function GetZ3950Terms(){
>@@ -237,7 +242,7 @@ function confirm_items_deletion() {
> 	[% IF ( CAN_user_reserveforothers ) %]
>     [% UNLESS ( norequests ) %]<li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">Place hold</a></li>[% END %]
> 	[% END %]
>-	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 Search" onclick="if (confirm(_('Please note that this Z39.50 search could replace the current record.'))){ PopupZ3950(); } return false;" /></li>[% END %]
>+	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 Search" onclick="PopupZ3950Confirmed(); return false;" /></li>[% END %]
>     </ul>
> </form>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>index 2a9deda..8360534 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>@@ -9,6 +9,8 @@
> <script type="text/javascript" src="[% themelang %]/js/background-job-progressbar.js"></script>
> <script type="text/JavaScript" language="JavaScript">
> //<![CDATA[
>+var MSG_CONFIRM_CLEAN = _("Clear all reservoir records staged in this batch?  This cannot be undone.");
>+
> $(document).ready(function(){
>   $("#staged-record-matching-rules select").change(function(){
>       var str = $(this).attr("id");
>@@ -237,7 +239,7 @@ Page
>           <form method="post" action="[% batch_lis.script_name %]" name="clean_batch_[% batch_lis.import_batch_id %]" id="clean_batch_[% batch_lis.import_batch_id %]" >
>             <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id %]" />
>             <input type="hidden" name="op" value="clean-batch" />
>-            <input type="submit" class="button" value="Clean" onclick="return confirm(_('Clear all reservoir records staged in this batch?  This cannot be undone.'));" />
>+            <input type="submit" class="button" value="Clean" onclick="return confirm(MSG_CONFIRM_CLEAN);" />
>           </form>
>         [% END %]
>     </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>index 7cca4d5..e8af64f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
>@@ -6,6 +6,8 @@
> //<![CDATA[ 
> 
> var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
>+var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these records from the shelf?");
>+var MSG_CONFIRM_DELETE_LIST = _("Are you sure you want to remove this list?");
> 
> $(document).ready(function(){
> 	$("#addbarcode").focus();
>@@ -247,7 +249,7 @@ function placeHold () {
>     </table><fieldset class="action">
>         [% IF ( itemsloop ) %]
>             <input type="button" id="placehold" style="display:none" onclick="placeHold(); return false;" value="Place holds" />
>-            [% IF ( allowremovingitems ) %]<input type="submit" value="Remove selected records" onclick="return confirm(_('Are you sure you want to remove these records from the shelf?'));" />[% END %]
>+            [% IF ( allowremovingitems ) %]<input type="submit" value="Remove selected records" onclick="return confirm(MSG_REMOVE_FROM_LIST);" />[% END %]
>             <input type="submit" value="Merge selected records" onclick="return MergeItems();" />
>         [% END %]
>  </fieldset>
>@@ -410,7 +412,7 @@ function placeHold () {
> 					<input type="hidden" name="CONFIRM-[% shelveslooppri.confirm %]" value="1" />
> 					<input type="submit" class="approve" value="Confirm" />
> 					[% ELSE %]
>-                    <input type="submit" class="deleteshelf" onclick="return confirmDelete(_('Are you sure you want to remove this list?'));" value="Delete" />
>+                    <input type="submit" class="deleteshelf" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);" value="Delete" />
> 					[% END %]
> 				</form>
> 			[% ELSE %]
>@@ -458,7 +460,7 @@ function placeHold () {
> 					<input type="hidden" name="CONFIRM-[% shelvesloo.confirm %]" value="1" />
> 					<input type="submit" class="approve" value="Confirm" />
> 					[% ELSE %]
>-                    <input type="submit" class="deleteshelf" onclick="return confirmDelete(_('Are you sure you want to remove this list?'));" value="Delete" />
>+                    <input type="submit" class="deleteshelf" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);" value="Delete" />
> 					[% END %]
> 				</form>
> 			[% ELSE %]
>diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
>index 1e245ad..9a51d07 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
>+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
>@@ -45,6 +45,8 @@
> 
> <script type="text/javascript" language="javascript">
> 	//<![CDATA[
>+    var MSG_CONFIRM_AGAIN = _("Warning: Cannot be undone. Please confirm once again")
>+    var MSG_DELETE_SEARCH_HISTORY = _("Are you sure you want to delete your search history?");
>     [% IF ( opacbookbag ) %]var MSG_BASKET_EMPTY = _("Your cart is currently empty");
>     var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
>     var MSG_RECORD_ADDED = _("This item has been added to your cart");
>diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
>index a82dc42..1e6b6ce 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
>@@ -8,7 +8,7 @@
> 
>             [% END %]
>             [% IF ( ShowOpacRecentSearchLink ) %]
>-                <li><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a class="logout" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history" onclick="return confirm(_('Are you sure you want to delete your search history?'));">x</a>]</li>
>+                <li><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a class="logout" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history" onclick="return confirm(MSG_DELETE_SEARCH_HISTORY);">x</a>]</li>
>             [% END %]
> 			[% IF ( loggedinusername ) %]<li><a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li>[% END %]
>    	</ul>	
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
>index adbc8f0..f026284 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
>@@ -55,7 +55,7 @@
>         <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">
>             <input type="hidden" name="op" value="delete_record" />
>             <p>Whatever your privacy rule you choose, you can delete all your reading history immediately by clicking here. <b>BE CAREFUL</b>. Once you've confirmed the deletion, no one can retrieve the list!</p>
>-            <input type="submit" value="Immediate deletion" onclick="return confirmDelete(_('Warning: Cannot be undone. Please confirm once again'));" />
>+            <input type="submit" value="Immediate deletion" onclick="return confirmDelete(MSG_CONFIRM_AGAIN);" />
>         </form>
>     [% END %]
>     </div>
>-- 
>1.7.10.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 8942: 12907 | 12908 | 12935 | 12939 | 13151 | 13756 | 13757 | 13758 | 14336 | 14337 | 14338 | 14934 | 14935 | 14936 | 15021 | 15058 | 15524 | 17030 | 17031 | 17032 | 17033 | 17034 | 17035