From d500929cfdc653b85325f42a96bc5acc90015515 Mon Sep 17 00:00:00 2001 From: Gaetan Boisson Date: Mon, 19 Mar 2012 15:51:39 +0100 Subject: [PATCH] Bug 7731 - Library should be used instead of branch and site standardized the use of the term "library" instead of "Branch" accross the interface and opac Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain --- .../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +- .../prog/en/includes/budgets-admin-toolbar.inc | 2 +- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../intranet-tmpl/prog/en/includes/circ-menu.tt | 2 +- .../prog/en/includes/error-messages.inc | 4 ++-- .../prog/en/modules/acqui/acqui-home.tt | 4 ++-- .../prog/en/modules/admin/admin-home.tt | 4 ++-- .../prog/en/modules/admin/aqbudget_owner_search.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/checkmarc.tt | 6 +++--- .../en/modules/admin/preferences/acquisitions.pref | 2 +- .../prog/en/modules/admin/preferences/admin.pref | 2 +- .../en/modules/admin/preferences/circulation.pref | 6 +++--- .../prog/en/modules/admin/preferences/opac.pref | 12 ++++++------ .../prog/en/modules/admin/preferences/searching.pref | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/cataloguing/additem.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/circ/selectbranchprinter.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- .../en/modules/help/admin/branch_transfer_limits.tt | 4 ++-- .../prog/en/modules/help/admin/smart-rules.tt | 6 +++--- .../prog/en/modules/help/circ/branchtransfers.tt | 4 ++-- .../prog/en/modules/help/circ/returns.tt | 10 +++++----- .../prog/en/modules/help/reports/itemslost.tt | 6 +++--- .../prog/en/modules/help/reports/manager.tt | 4 ++-- .../prog/en/modules/help/reserve/request.tt | 4 ++-- .../prog/en/modules/help/serials/subscription-add.tt | 2 +- .../prog/en/modules/help/tools/holidays.tt | 2 +- .../prog/en/modules/help/tools/import_borrowers.tt | 2 +- .../prog/en/modules/labels/label-edit-batch.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 2 +- .../prog/en/modules/patroncards/edit-batch.tt | 2 +- .../prog/en/modules/patroncards/manage.tt | 2 +- .../modules/reports/issues_by_borrower_category.tt | 4 ++-- .../prog/en/modules/reports/issues_stats.tt | 4 ++-- .../prog/en/modules/reports/itemslost.tt | 4 ++-- .../prog/en/modules/reports/serials_stats.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/serials/claims.tt | 4 ++-- .../prog/en/modules/serials/serials-collection.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/inventory.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- .../intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl | 2 +- .../opac-tmpl/prog/en/includes/opac-topissues.inc | 4 ++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 4 ++-- .../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-topissues.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-userdetails.tt | 2 +- 48 files changed, 82 insertions(+), 82 deletions(-) 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 74dd667ab4..5107d019ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -18,7 +18,7 @@
Basic parameters
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index ee24d76b55..9b816cec3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -47,7 +47,7 @@ [% UNLESS ( CAN_user_acquisition_planning_manage ) %], id:'disabled' [% END %] }, - { text: _("Plan by Branches"), + { text: _("Plan by libraries"), url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=BRANCHES" [% UNLESS ( CAN_user_acquisition_planning_manage ) %], id:'disabled' [% END %] }, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 00dc4456a8..472db641b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -58,7 +58,7 @@ [% END %] [% END %][% END %]
  • Category: [% categoryname %] ([% categorycode %])
    • -
  • Home Library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]
    • +
  • Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]
    • -[% INCLUDE 'intranet-bottom.inc' %] \ No newline at end of file +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt index b224078211..4b7a668bdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -275,7 +275,7 @@ [% END %] - Home branch + Home library
  • - + [% END %] Vendor - Branch + Library Title Issue number Status diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index a0d4bb539f..1293f56f3b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -208,7 +208,7 @@ $(document).ready(function() { Notes - Branch + Library [% IF ( routing ) %]Routing[% END %] [% IF ( CAN_user_serials_receive_serials ) %]Edit[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt index f95a943bb1..e3071a2bad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -76,9 +76,9 @@ $(document).ready(function(){
    Select items you want to check
    1. - - Home Branch - Holding Branch + + Home library + Current location
    2. - + [% FOREACH branchloo IN branchloop %] [% IF ( branch == branchname ) %]
    - \ No newline at end of file + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 7af60a0353..aace3e34c8 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -556,7 +556,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { - + @@ -780,7 +780,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {

    There are [% subscriptionsnumber %] subscription(s) associated with this title.

    [% FOREACH subscription IN subscriptions %] [% IF ( subscription.branchname ) %]

    At library: [% subscription.branchname %]

    [% ELSE %] - [% IF ( subscription.branchcode ) %]

    At branch: [% subscription.branchcode %]

    [% END %][% END %] + [% IF ( subscription.branchcode ) %]

    At library: [% subscription.branchcode %]

    [% END %][% END %] [% IF ( subscription.subscriptionnotes ) %]

    [% subscription.subscriptionnotes %]

    [% END %]

    Subscription from: [% subscription.histstartdate %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate %] [% ELSE %] now (current)[% END %]

    [% IF ( subscription.missinglist ) %]

    Missing issues: [% subscription.missinglist %]

    [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt index d8757bbc72..7897f0ed46 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt @@ -92,7 +92,7 @@ $.tablesorter.addParser({ [% END %] [% IF ( branch_loop ) %] -
  • +
  • - + [% FOREACH branchloo IN branchloop %] [% IF ( branchloo.selected ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt index fdf0b49aed..2767436d35 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt @@ -45,7 +45,7 @@ Card Number:
    • -[% IF ( joiningbranch ) %][% ELSE %] [% END %]
    BranchLibrary Serial collection
    [% cardnumber %]
    Expires:[% dateexpiry %]
    Joining Branch:[% joiningbranch %]
    +[% IF ( joiningbranch ) %]Joining library:[% joiningbranch %][% ELSE %] [% END %] -- 2.39.5
    Identity Details