Bugzilla – Attachment 29516 Details for
Bug 12062
Untranslatable "Reserve not found"
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12062 - Follow up to fix more untraslatable cases
PASSED-QA-Bug-12062---Follow-up-to-fix-more-untras.patch (text/plain), 4.99 KB, created by
Katrin Fischer
on 2014-07-06 17:20:33 UTC
(
hide
)
Description:
[PASSED QA] Bug 12062 - Follow up to fix more untraslatable cases
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-07-06 17:20:33 UTC
Size:
4.99 KB
patch
obsolete
>From bbf5ef6535814547bdc7a7f400c1c62cdd0daffd Mon Sep 17 00:00:00 2001 >From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Date: Tue, 29 Apr 2014 16:31:15 -0300 >Subject: [PATCH] [PASSED QA] 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 > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > circ/hold-transfer-slip.pl | 1 + > circ/transfer-slip.pl | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt | 9 ++++++++- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt | 4 ++-- > members/printslip.pl | 3 ++- > opac/sco/printslip.pl | 2 +- > 6 files changed, 15 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..d9f22d3 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 => 'transfer', > 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 8603e16..7fc56fb 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' %] >-<title>Koha › Circulation › Transfers</title> >+[% IF ( caller = 'hold-transfer' %] >+<title>Koha › Circulation › Hold transfer print receipt</title> >+[% ELSIF ( caller == 'transfer' %] >+<title>Koha › Circulation › Transfers print receipt</title> >+[% ELSIF ( caller == 'members' %] >+<title>Koha › Members › Print receipt for [% borrowernumber %]</title> >+[% END %] >+ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> >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 8ad25ac..8f02235 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 %]</title> >+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout › Print Receipt for [% borrowernumber %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> >@@ -27,4 +27,4 @@ > } > </script> > </body> >-</html> >\ No newline at end of file >+</html> >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.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12062
:
27397
|
27401
|
27430
|
27780
|
27782
|
27818
|
29463
|
29515
| 29516 |
29517