Attachment 46037 Details for Bug 15231 – Bug 15301: branchtransfers.tt: Remove ambiguous "To" and fix splitted sentence

[patch] Bug 15301: branchtransfers.tt: Remove ambiguous "To" and fix splitted sentence

-Bug-15301-branchtransferstt-Remove-ambiguous-To-a.patch (text/plain), 7.36 KB, created by Brendan Gallagher on 2015-12-29 22:37:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Gallagher

Created: 2015-12-29 22:37:41 UTC

Size: 7.36 KB

patch

obsolete

>From 7a667b5ce4d4cc6290a0d1a52765d25ad72ab22e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Wed, 2 Dec 2015 15:34:44 +0100
>Subject: [PATCH] Bug 15301: branchtransfers.tt: Remove ambiguous "To" and
> fix splitted sentence
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>The file intranet-tmpl/prog/en/modules/circ/branchtransfers.tt contains two
>ambiguous words 'to' and a sentence splitted up by html tags, leading to weird
>translations. Example in German: "Sie kÃ¶nnen keine Exemplare aus itemtype
>transferieren BK fÃ¼r: Airfield"
>
>To test:
>- Apply patch
>
>- Set up transfer policies for item types and collection codes in
> Home > Administration > Set library checkin and transfer policy
> Make sure that you have rules that deny and others that allow transfers
>
>- Verify that syspref 'UseBranchTransferLimits' is set to 'Enforce'
>
>- Set 'BranchTransferLimitTypes' to 'item type'
>
>- Go to Home > Circulation > Transfers
>- Transfer an item that is allowed for item type
> - Verify that the table of transferred items displays information
> about Item type, Collection code and Destination
>
>- Transfer an item that is not allowed for the item type
> - Verify that the information about not allowing the transfer displays
> properly and is meaningfull
>
>- Set 'BranchTransferLimitTypes' to 'collection code'
>
>- Repeat the transfer steps above for allowed / not allowed collection code
>
>(Amended to add ids to table and 8 columns, see comment #2)
>(Amended for comment #5)
>Followup for comment #8
>
>Signed-off-by: FrÃ©dÃ©ric Demians <f.demians@tamil.fr>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>
>Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
>
>Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
>
>http://bugs.koha-community.org/show_bug.cgi?id=15231
>---
> circ/branchtransfers.pl | 10 -----
> .../prog/en/modules/circ/branchtransfers.tt | 44 ++++++++++++++--------
> 2 files changed, 29 insertions(+), 25 deletions(-)
>
>diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
>index 4caca05..22c9a07 100755
>--- a/circ/branchtransfers.pl
>+++ b/circ/branchtransfers.pl
>@@ -188,15 +188,6 @@ if ($found) {
> }
> }
> 
>-#####################
>-
>-# Used for branch transfer limits error messages.
>-my $codeTypeDescription = 'Collection Code';
>-my $codeType = C4::Context->preference("BranchTransferLimitsType");
>-if ( $codeType eq 'itemtype' ) { 
>- $codeTypeDescription = 'Item Type';
>-}
>-
> my @errmsgloop;
> foreach my $code ( keys %$messages ) {
> if ( $code ne 'WasTransfered' ) {
>@@ -212,7 +203,6 @@ foreach my $code ( keys %$messages ) {
> my ( $tbr, $typecode ) = split( /::/, $messages->{'NotAllowed'} );
> $err{tbr} = $branches->{ $tbr }->{'branchname'};
> $err{code} = $typecode;
>- $err{codeType} = $codeTypeDescription;
> }
> elsif ( $code eq 'IsPermanent' ) {
> $err{errispermanent} = 1;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>index 1d47060..e2916d9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>@@ -1,3 +1,6 @@
>+[% USE Koha %]
>+[% USE ItemTypes %]
>+[% USE AuthorisedValues %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Circulation &rsaquo; Transfers</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -110,7 +113,16 @@
> <li>Please return item to home library: [% errmsgloo.msg %]</li>
> [% END %]
> [% IF ( errmsgloo.errnotallowed ) %]
>- <li>You cannot transfer items of [% errmsgloo.codeType %] [% errmsgloo.code %] to [% errmsgloo.tbr %]</li>
>+ <li>Transfer is not allowed for:
>+ <ol>
>+ [% IF ( Koha.Preference('BranchTransferLimitsType') == 'itemtype' ) %]
>+ <li>Item type: [% ItemTypes.GetDescription( errmsgloo.code ) %]</li>
>+ [% ELSE %]
>+ <li>Collection code: [% AuthorisedValues.GetByCode( 'CCODE', errmsgloo.code ) %]</li>
>+ [% END %]
>+ <li>Destination library: [% errmsgloo.tbr %]</li>
>+ </ol>
>+ </li>
> [% END %]
> [% IF ( errmsgloo.errdesteqholding ) %]
> <li>Item is already at destination library.</li>
>@@ -164,23 +176,25 @@
> 		<table>
> <caption>Transferred items</caption>
> <tr>
>- <th>Title</th>
>- <th>Author</th>
>- <th>Barcode</th>
>- <th>Shelving location</th>
>- <th>Call number</th>
>- <th>Type</th>
>- <th>To</th>
>+ <th class="tf-title">Title</th>
>+ <th class="tf-author">Author</th>
>+ <th class="tf-barcode">Barcode</th>
>+ <th class="tf-location">Shelving location</th>
>+ <th class="tf-itemcallnumber">Call number</th>
>+ <th class="tf-itemtype">Item type</th>
>+ <th class="tf-ccode">Collection code</th>
>+ <th class="tf-destination">Destination</th>
> </tr>
> [% FOREACH trsfitemloo IN trsfitemloop %]
> <tr>
>- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber %]">[% trsfitemloo.title |html %]</a></td>
>- <td>[% trsfitemloo.author %]</td>
>- <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber %]&amp;itemnumber=[% trsfitemloo.itemnumber %]#item[% trsfitemloo.itemnumber %]">[% trsfitemloo.barcode %]</a></td>
>- <td>[% trsfitemloo.location %]</td>
>- <td>[% trsfitemloo.itemcallnumber %]</td>
>- <td>[% trsfitemloo.ccode %]</td>
>- <td>[% trsfitemloo.tobrname %]</td>
>+ <td class="tf-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber %]">[% trsfitemloo.title |html %]</a></td>
>+ <td class="tf-author">[% trsfitemloo.author %]</td>
>+ <td class="tf-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber %]&amp;itemnumber=[% trsfitemloo.itemnumber %]#item[% trsfitemloo.itemnumber %]">[% trsfitemloo.barcode %]</a></td>
>+ <td class="tf-location">[% trsfitemloo.location %]</td>
>+ <td class="tf-itemcallnumber">[% trsfitemloo.itemcallnumber %]</td>
>+ <td class="tf-itemtype">[% ItemTypes.GetDescription( trsfitemloo.itemtype ) %]</td>
>+ <td class="tf-ccode">[% AuthorisedValues.GetByCode( 'CCODE', trsfitemloo.ccode ) %]</td>
>+ <td class="tf-destination">[% trsfitemloo.tobrname %]</td>
> </tr>
> [% END %]
> </table>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15231: 45087 | 45092 | 45343 | 45346 | 45441 | 46037 | 46038 | 46039