From a1df0c7016021d2c5804ea502ff536e489e9447e Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Tue, 29 Apr 2014 16:31:15 -0300 Subject: [PATCH] Bug 12062 - Follow up to fix more untraslatable cases This patch modifies staff printslip.tt to take into account caller. Also fixes similar problem on opac printslip.tt To test: staff 1. Print hold transfer slip 2. Print transfer slip 3. Print member slip opac 4. Print self checkout slip 5. Update translation files, check new strings are present --- circ/hold-transfer-slip.pl | 1 + circ/transfer-slip.pl | 2 +- .../prog/en/modules/circ/printslip.tt | 9 ++++++++- .../bootstrap/en/modules/sco/printslip.tt | 5 +++-- members/printslip.pl | 3 ++- opac/sco/printslip.pl | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl index 956fd14..28de5e9 100755 --- a/circ/hold-transfer-slip.pl +++ b/circ/hold-transfer-slip.pl @@ -58,6 +58,7 @@ if ( my $letter = ReserveSlip ($session->param('branch') || $userenv->{branch}, $is_html = $letter->{is_html}; } $template->param( slip => $slip ) if ($slip); +$template->param( caller => 'hold-transfer' ); $template->param( plain => !$is_html ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/transfer-slip.pl b/circ/transfer-slip.pl index c8e97a0..e4f2d1d 100755 --- a/circ/transfer-slip.pl +++ b/circ/transfer-slip.pl @@ -64,7 +64,7 @@ else { $template->param( slip => $slip, plain => !$is_html, - title => "Koha -- Circulation: Transfers", + caller => 'transfers', stylesheet => C4::Context->preference("SlipCSS"), ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt index a2c01ea..3577d23 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt @@ -1,6 +1,13 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Transfers +[% IF ( caller = 'hold-transfer' %] +Koha › Circulation › Hold transfer print receipt +[% ELSIF ( caller == 'transfer' %] +Koha › Circulation › Transfers print receipt +[% ELSIF ( caller == 'members' %] +Koha › Members › Print receipt for [%- borrowernumber -%] +[% END %] + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt index 224c916..4f2c7ca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -[% title %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout › Print Receipt for [%- borrowernumber -%] @@ -27,4 +27,5 @@ } - \ No newline at end of file + + diff --git a/members/printslip.pl b/members/printslip.pl index 71fdda2..7085d38 100755 --- a/members/printslip.pl +++ b/members/printslip.pl @@ -84,7 +84,8 @@ if (my $letter = IssueSlip ($session->param('branch') || $branch, $borrowernumbe $template->param( slip => $slip, plain => !$is_html, - title => "Print Receipt for $borrowernumber", + borrowernumber => $borrowernumber, + caller => 'members', stylesheet => C4::Context->preference("SlipCSS"), error => $error, ); diff --git a/opac/sco/printslip.pl b/opac/sco/printslip.pl index e8a5685..62a79bb 100755 --- a/opac/sco/printslip.pl +++ b/opac/sco/printslip.pl @@ -61,7 +61,7 @@ if (my $letter = IssueSlip ($session->param('branch') || $branch, $borrowernumbe $template->{VARS}->{slip} = $slip; $template->{VARS}->{plain} = !$is_html; -$template->{VARS}->{title} = "Print Receipt for $borrowernumber"; +$template->{VARS}->{borrowernumber} = $borrowernumber; $template->{VARS}->{stylesheet} = C4::Context->preference("SlipCSS"); $template->{VARS}->{error} = $error; -- 1.7.9.5