Skip to content

Commit

Permalink
Bug 8942: Translation process breaks javascript (followup 2)
Browse files Browse the repository at this point in the history 
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>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
  • Loading branch information
@jcamins
Fridolyn SOMERS authored and jcamins committed Jan 31, 2013
1 parent c80de7b commit 9a5818c
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 8 deletions.
7 changes: 6 additions & 1 deletion koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
View file
Expand Up @@ -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(){
Expand Down Expand Up @@ -238,7 +243,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>
Expand Down
4 changes: 3 additions & 1 deletion koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
View file
Expand Up @@ -28,6 +28,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");
Expand Down Expand Up @@ -291,7 +293,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>
Expand Down
4 changes: 3 additions & 1 deletion koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
View file
Expand Up @@ -10,6 +10,8 @@
<script type="text/javascript" src="[% themelang %]/js/jquery.jeditable.mini.js"></script>
<script type="text/javascript">
//<![CDATA[
var MSG_ID_HELP = _("Click on the quote's id to select or deselect the quote. Multiple quotes may be selected.");

var oTable; /* oTable needs to be global */
var sEmptyTable = _("No quotes available. Please use the \"Add quote\" button to add a quote."); /* override the default message in datatables-strings.inc */
$(document).ready(function() {
Expand Down Expand Up @@ -204,7 +206,7 @@
<table id="quotes_editor">
<thead>
<tr>
<th><span style="cursor: help" onclick="event.stopPropagation();alert(_('Click on the quote\'s id to select or deselect the quote. Multiple quotes may be selected.'));">ID</span></th>
<th><span style="cursor: help" onclick="event.stopPropagation();alert(MSG_ID_HELP);">ID</span></th>
<th>Source</th>
<th>Text</th>
<th>Last displayed</th>
Expand Down
8 changes: 5 additions & 3 deletions koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
View file
Expand Up @@ -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();
Expand Down Expand Up @@ -251,7 +253,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>
Expand Down Expand Up @@ -416,7 +418,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 %]
Expand Down Expand Up @@ -464,7 +466,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 %]
Expand Down
2 changes: 2 additions & 0 deletions koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
View file
Expand Up @@ -51,6 +51,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");
Expand Down
2 changes: 1 addition & 1 deletion koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
View file
Expand Up @@ -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>
Expand Down

0 comments on commit 9a5818c

Please sign in to comment.