From 91d5a8384939b6a6a6082ccaef69645ef31f91e2 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 25 Aug 2014 14:52:58 +0200 Subject: [PATCH] Bug 6536: QA Follow-up for string changes referring to Z39.50 Z39.50 search now includes SRU targets. This patch only touches strings referring to it. No changes in behavior. It replaces Z39.50 with Z39.50/SRU or external. Deletes obsolete template z3950/searchresult.tt: not in use for some time. Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- .../prog/en/includes/admin-menu.inc | 2 +- .../prog/en/includes/cat-toolbar.inc | 4 +- .../prog/en/includes/z3950-admin-search.inc | 4 +- .../prog/en/modules/acqui/z3950_search.tt | 2 +- .../prog/en/modules/admin/admin-home.tt | 4 +- .../prog/en/modules/admin/z3950servers.tt | 12 ++--- .../prog/en/modules/catalogue/results.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 4 +- .../prog/en/modules/cataloguing/addbooks.tt | 2 +- .../en/modules/cataloguing/z3950_search.tt | 6 +-- .../prog/en/modules/z3950/searchresult.tt | 45 ------------------- 11 files changed, 21 insertions(+), 66 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tt diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc index 8d667e0437..a86aab2738 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -60,7 +60,7 @@ 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 a296dd16be..ceaf24704e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -9,7 +9,7 @@ } } function PopupZ3950Confirmed() { - if (confirm(_("Please note that this Z39.50 search could replace the current record."))){ + if (confirm(_("Please note that this external search could replace the current record."))){ PopupZ3950(); } } @@ -194,7 +194,7 @@ CAN_user_serials_create_subscription ) %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
  • Edit as new (duplicate)
    • -
  • Replace record via Z39.50
    • +
  • Replace record via Z39.50/SRU
    • [% IF ( count ) %]
  • Delete record
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc index b09186f996..f8430694d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc @@ -2,7 +2,7 @@

    [% LibraryName %]

    [% IF ( stopwords_removed ) %]

    Ignored the following common words: "[% stopwords_removed %]"

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 790a57b119..26e3b627e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -70,7 +70,7 @@ }); $("#z3950search").click(function(){ - if (confirm(_("Please note that this Z39.50 search could replace the current record."))){ + if (confirm(_("Please note that this external search could replace the current record."))){ PopupZ3950(); } }); @@ -456,7 +456,7 @@ function Changefwk(FwkList) { [% END %] [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] -
    Z39.50 search
    +
    Z39.50/SRU search
    [% IF (biblionumber) %] [% IF ( BiblioDefaultViewmarc ) %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index 5309f0cd35..21a7140008 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -62,7 +62,7 @@
    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt index 3e792472a4..dff3014516 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Z39.50 search results +Koha › Z39.50/SRU search results [% INCLUDE 'greybox.inc' %] [% INCLUDE 'doc-head-close.inc' %] @@ -54,7 +54,7 @@ $(document).ready(function(){ }); $("form[name='f']").submit(function(){ if ($('input[type=checkbox]').filter(':checked').length == 0) { - alert(_("Please choose at least one Z39.50 target")); + alert(_("Please choose at least one external target")); return false; } else return true; @@ -101,7 +101,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% END %]
    [% IF ( opsearch ) %] -

    Z39.50 search points

    +

    Z39.50/SRU search

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tt deleted file mode 100644 index 842bbb938b..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tt +++ /dev/null @@ -1,45 +0,0 @@ -[% INCLUDE 'doc-head-open.inc' %] -Koha › Z39.50 search results -[% INCLUDE 'doc-head-close.inc' %] - - - - -

    Z3950 search results

    - - [% IF ( breeding_loop ) %] - - - - - - - - - - [% FOREACH breeding_loo IN breeding_loop %] - - - - - - - - [% END %] -
    TitleAuthorISBNComing from  
    [% breeding_loo.title |html %][% breeding_loo.author %][% breeding_loo.isbn %][% breeding_loo.file %]Import this biblio
    - [% ELSE %] -

    Nothing found

    - [% END %] - [% IF ( numberpending ) %]

    Still [% numberpending %] requests to go

    [% END %] - - - - -- 2.39.5