From 8374ecbcd68fc0f6f9bc13ed7b45448920490bba Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 3 Dec 2011 09:55:44 +0100 Subject: [PATCH] Bug 7313: Untranslatable strings in 'Search to hold' feature Changed the javascript to include markup for translation _(...) in result list and detail page tool bars. Also changed the text shown for each result to match the text in the toolbar to make things more consistent. To test: - Apply patch - Run "perl translate update " - Open .po file for staff and check for "Place hold on" and "Forget" - Translate those - Run "perl translate install " - Activate "Search for hold" feature in patron account - Do a search and check tool bar on top of result list - Check link text shown in result list - Check detail page Signed-off-by: Chris Cormack Signed-off-by: Paul Poulain --- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 6 +++--- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 10 +++++----- 2 files changed, 8 insertions(+), 8 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 4b54c40daa..413d7f463d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -161,8 +161,8 @@ function confirm_items_deletion() { location.href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"; } var HoldForButtonMenu = [ - { text: "Place hold", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]" }, - { text: "Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&findborrower=[% holdfor_cardnumber %]" } + { text: _("Place hold"), url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]" }, + { text: _("Place hold for")+ " [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", url: "/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&findborrower=[% holdfor_cardnumber %]" } ]; // Instantiate a Split Button using the array of YAHOO.widget.MenuItem @@ -172,7 +172,7 @@ function confirm_items_deletion() { var HoldForButton = new YAHOO.widget.Button({ id: "holdfor", type: "split", - label: "Place hold", + label: _("Place hold"), name: "holdfor", menu: HoldForButtonMenu, container: this, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 8eb742ada5..4b4e0889e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -194,13 +194,13 @@ YAHOO.util.Event.onContentReady("searchheader", function () { placeHold(); } var HoldForButtonMenu = [ - { text: "Place hold", onclick: { fn: holdFor }}, - { text: "Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: holdForPatron }}, - { text: "Forget [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: forgetPatron }}]; + { text: _("Place hold"), onclick: { fn: holdFor }}, + { text: _("Place hold for") + " [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: holdForPatron }}, + { text: _("Forget") + " [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])", onclick: { fn: forgetPatron }}]; var HoldForButton = new YAHOO.widget.Button({ type: "split", - label: "Place hold", + label: _("Place hold"), name: "holdfor", menu: HoldForButtonMenu, container: "placeholdc", @@ -513,7 +513,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () { No holds allowed [% ELSE %] Holds - [% IF ( holdfor ) %] | Hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])[% END %] + [% IF ( holdfor ) %] | Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])[% END %] [% END %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] | Edit record -- 2.39.5