Bugzilla – Attachment 45488 Details for
Bug 15301
Translatability: branchtransfers.tt: Remove ambiguous "To" and fix splitted sentence.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15301: branchtransfers.tt: Remove ambiguous "To" and fix splitted sentence
Bug-15301-branchtransferstt-Remove-ambiguous-To-an.patch (text/plain), 7.05 KB, created by
Frédéric Demians
on 2015-12-08 12:03:29 UTC
(
hide
)
Description:
Bug 15301: branchtransfers.tt: Remove ambiguous "To" and fix splitted sentence
Filename:
MIME Type:
Creator:
Frédéric Demians
Created:
2015-12-08 12:03:29 UTC
Size:
7.05 KB
patch
obsolete
>From 8c60e348248797fa28a2094fa8151a348879366d 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) > >Signed-off-by: Frédéric Demians <f.demians@tamil.fr> >--- > circ/branchtransfers.pl | 11 +----- > .../prog/en/modules/circ/branchtransfers.tt | 43 ++++++++++++++-------- > 2 files changed, 29 insertions(+), 25 deletions(-) > >diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl >index 4caca05..3541229 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,7 @@ foreach my $code ( keys %$messages ) { > my ( $tbr, $typecode ) = split( /::/, $messages->{'NotAllowed'} ); > $err{tbr} = $branches->{ $tbr }->{'branchname'}; > $err{code} = $typecode; >- $err{codeType} = $codeTypeDescription; >+ $err{codeType} = C4::Context->preference("BranchTransferLimitsType"); > } > 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..f3b394d 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,5 @@ >+[% USE ItemTypes %] >+[% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Transfers</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -110,7 +112,16 @@ > <li>Please return item to home library: [% errmsgloo.msg %]</li> > [% END %] > [% IF ( errmsgloo.errnotallowed ) %] >- <li>You cannot transfer items of [% errmsgloo.codeType %] <b>[% errmsgloo.code %]</b> to <b>[% errmsgloo.tbr %]</b></li> >+ <li>Transfer is not allowed for: >+ <ol> >+ [% IF ( errmsgloo.codeType ) == 'itemtype' %] >+ <li>Item type: <b>[% ItemTypes.GetDescription( errmsgloo.code ) %]</b></li> >+ [% ELSE %] >+ <li>Collection code: <b>[% AuthorisedValues.GetByCode( 'CCODE', errmsgloo.code ) %]</b></li> >+ [% END %] >+ <li>Destination library: <b>[% errmsgloo.tbr %]</b></li> >+ </ol> >+ </li> > [% END %] > [% IF ( errmsgloo.errdesteqholding ) %] > <li>Item is already at destination library.</li> >@@ -164,23 +175,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 id="title">Title</th> >+ <th id="author">Author</th> >+ <th id="barcode">Barcode</th> >+ <th id="location">Shelving location</th> >+ <th id="itemcallnumber">Call number</th> >+ <th id="itemtype">Item type</th> >+ <th id="ccode">Collection code</th> >+ <th id="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 %]&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="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber %]">[% trsfitemloo.title |html %]</a></td> >+ <td class="author">[% trsfitemloo.author %]</td> >+ <td class="barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber %]&itemnumber=[% trsfitemloo.itemnumber %]#item[% trsfitemloo.itemnumber %]">[% trsfitemloo.barcode %]</a></td> >+ <td class="location">[% trsfitemloo.location %]</td> >+ <td class="itemcallnumber">[% trsfitemloo.itemcallnumber %]</td> >+ <td class="itemtype">[% ItemTypes.GetDescription( trsfitemloo.itemtype ) %]</td> >+ <td class="ccode">[% AuthorisedValues.GetByCode( 'CCODE', trsfitemloo.ccode ) %]</td> >+ <td class="destination">[% trsfitemloo.tobrname %]</td> > </tr> > [% END %] > </table> >-- >2.6.2
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 15301
:
45394
|
45486
|
45487
|
45488
|
45506
|
45507
|
45516
|
46036