Attachment 145124 Details for Bug 32588 – Bug 32588: Make filters on 'items with no checkouts' report translatable

[patch] Bug 32588: Make filters on 'items with no checkouts' report translatable

Bug-32588-Make-filters-on-items-with-no-checkouts-.patch (text/plain), 6.01 KB, created by Katrin Fischer on 2023-01-07 02:15:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-01-07 02:15:42 UTC

Size: 6.01 KB

patch

obsolete

>From 125435ec8c11c4e4ca6caa420531c9cf37c64389 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sat, 7 Jan 2023 02:11:48 +0000
>Subject: [PATCH] Bug 32588: Make filters on 'items with no checkouts' report
> translatable
>
>This makes the filters on top of the 'items with no checkouts' report
>translatable. The descriptions of the filters used the wrong terms and
>were also pulled from the .pl file, making them untranslatable.
>
>To test:
>* Without patch: Run the 'items with no checkouts' report with various
> settigs.
>* Verify, that the display on top doesn't use standard terminology
> Doc type = item type, Branch = library
>* Apply patch
>* Verify display is improved and standard terminology is used
>
>If you know how to, you can also confirm strings show up nicely in
>translations:
>https://wiki.koha-community.org/wiki/Translating_Koha#Updating_the_po_files_in_your_installation
>---
> .../prog/en/modules/reports/catalogue_out.tt | 45 ++++++++++++-------
> reports/catalogue_out.pl | 4 +-
> 2 files changed, 30 insertions(+), 19 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 198877d24c..92034222b9 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
>@@ -40,24 +40,35 @@
> [% FOREACH mainloo IN mainloop %]
> [% IF ( mainloo.loopfilter ) %]
> Filtered on:
>- [% FOREACH loopfilte IN mainloo.loopfilter %]
>- [% IF ( loopfilte.err ) %]
>- Error:
>- [% ELSE %]
>- 
>- [% END %]
>- [% IF ( loopfilte.sql ) %]
>- 
>- [% loopfilte.crit | html %] = [% loopfilte.filter | html %]
>- 
>- [% ELSE %]
>- [% loopfilte.crit | html %] = [% loopfilte.filter | html %]
>- [% IF ( loopfilte.crit == "by" ) %]
>- [% group_by = loopfilte.filter %]
>+ <ul>
>+ [% FOREACH loopfilte IN mainloo.loopfilter %]
>+ [% IF ( loopfilte.err ) %]
>+ Error: [% loopfilte.filter | html %]
>+ [% ELSIF ( loopfilte.sql ) %]
>+ 
>+ [% loopfilte.crit | html %] = [% loopfilte.filter | html %]
>+ 
>+ [% ELSE %]
>+ [% SWITCH loopfilte.crit %]
>+ [% CASE 'homelibrary' %]<li>Home library: [% Branches.GetName( loopfilte.filter ) | html %]</li>
>+ [% CASE 'itemtype' %]<li>Item type: [% ItemTypes.GetDescription( loopfilte.filter ) | html %]</li>
>+ [% CASE 'limit' %]<li>Limit: [% loopfilte.filter | html %]</li>
>+ [% CASE 'by' %]
>+ <li>By: 
>+ [% group_by = loopfilte.filter %]
>+ [% IF ( group_by == "homebranch") %]
>+ Home library
>+ [% ELSIF ( group_by == "itype" ) %]
>+ Item type
>+ [% ELSE %]
>+ None
>+ [% END %]
>+ </li>
>+ [% CASE %]<li>[% loopfilte.crit %]: [% loopfilte.filter | html %]</li>
>+ [% END %]
> [% END %]
> [% END %]
>- 
>- [% END %]
>+ </ul>
> [% END %]
> 
> [% IF ( mainloo.looptables ) %]
>@@ -78,7 +89,7 @@
> [% ELSIF ( group_by=="homebranch" ) %]
> <a href="#table[% looptable.coltitle | uri %]">[% Branches.GetName( looptable.coltitle ) | html %]</a>
> [% ELSE %]
>- <a href="#table[% looptable.coltitle | uri %]">[% looptable.coltitle | html %]</a>
>+ <a href="#table[% looptable.coltitle | uri %]">Ungrouped</a>
> [% END %]
> </td>
> <td>
>diff --git a/reports/catalogue_out.pl b/reports/catalogue_out.pl
>index 51961790a8..c03dcb2d80 100755
>--- a/reports/catalogue_out.pl
>+++ b/reports/catalogue_out.pl
>@@ -76,8 +76,8 @@ sub calculate {
> if ( ( $i == 1 ) and ( @$filters[ $i - 1 ] ) ) {
> $cell{err} = 1 if ( @$filters[$i] < @$filters[ $i - 1 ] );
> }
>- $cell{crit} = "Branch" if ( $i == 0 );
>- $cell{crit} = "Doc Type" if ( $i == 1 );
>+ $cell{crit} = "homelibrary" if ( $i == 0 );
>+ $cell{crit} = "itemtype" if ( $i == 1 );
> push @loopfilter, \%cell;
> }
> }
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32588: 145124 | 145130 | 145861 | 145871