From b8e1e7e217363a165275dca46e7d123633a64920 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 9 Aug 2013 09:50:49 -0400
Subject: [PATCH] Bug 7478: fix template translation problem in
 catalogue_out.tt

The items with no checkouts template has a sections that uses DEFAULT to
set some strings: [% DEFAULT loopro.itemcallnumber="No Call Number" %]
This appears to be untranslatable with our current translation tool.

This patch changes the template so that it uses a simple [% IF %] block
to display the default text if no value is set. Added is use of the
Branches template plugin to show library name instead of code.

This patch also fixes an error introduced in my fix for Bug 8124 causing
the page to default to CSV download instead of output to screen.

To test, apply the patch and confirm that the default text appears
onscreen in reports which include results that have a missing barcode,
title, or call number. Results should be displayed on screen correctly.

Run "perl translate update" for any language and confirm that the newly
generated po file includes "No call number," "No barcode," and "NO
TITLE" for catalogue_out.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, thx Owen!

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../prog/en/modules/reports/catalogue_out.tt  | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
index b098cc7312..1e8d011c21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
@@ -1,3 +1,4 @@
+[% USE Branches %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Reports &rsaquo; Items with no checkouts</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -65,21 +66,14 @@
 			</tr>
 				[% IF ( looptable.looprow ) %]
 				[% FOREACH loopro IN looptable.looprow %]
-				[% DEFAULT
-                    loopro.itemcallnumber="No call number"
-                    loopro.barcode="No barcode"
-				    loopro.title="NO TITLE"
-				    loopro.author=""
-				%]
 				    [% UNLESS ( loop.odd ) %]<tr class="highlight">
 		                    [% ELSE %]<tr>[% END %]
 		    
 						<td>[% loop.count %]</td>
-						<td>[% loopro.itemcallnumber %]</td>
-						<td>[% loopro.barcode %]</td>
- 						<td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber %]">[% loopro.title %]</a></p>
-							[% loopro.author %]
-							[% IF ( loopro.branch ) %]at [% loopro.branch %][% END %]
+                        <td>[% IF ( loopro.itemcallnumber ) %][% loopro.itemcallnumber %][% ELSE %]No call number[% END %]</td>
+                        <td>[% IF ( loopro.barcode ) %][% loopro.barcode %][% ELSE %]No barcode[% END %]</td>
+                        <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber %]">[% IF ( loopro.title ) %][% loopro.title %][% ELSE %]NO TITLE[% END %]</a> [% IF ( loopro.author ) %] by [% loopro.author %][% END %]</p>
+                            [% IF ( loopro.branch ) %]at [% Branches.GetName( loopro.branch ) %][% END %]
 						</td>
 					</tr>
 				[% END %]
@@ -159,7 +153,8 @@
 	<fieldset class="action">
 	<input type="submit" value="Submit" />
 	<input type="hidden" name="report_name" value="[% report_name %]" />
-	<input type="hidden" name="do_it" value="1" />
+    <input type="hidden" name="do_it" value="1" />
+    <input type="hidden" name="output" value="screen" />
 	</fieldset>
 	</form>
 [% END %]
-- 
2.39.5