Attachment 45610 Details for Bug 15355 – Bug 15355: Translatability: Fix issues on check in page

[patch] Bug 15355: Translatability: Fix issues on check in page

Bug-15355-Translatability-Fix-issues-on-check-in-p.patch (text/plain), 12.22 KB, created by Marc Véron on 2015-12-11 17:17:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-12-11 17:17:40 UTC

Size: 12.22 KB

patch

obsolete

>From 671d38cdf6c7b7b3539ea496cde68f541da44292 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Fri, 11 Dec 2015 18:06:10 +0100
>Subject: [PATCH] Bug 15355: Translatability: Fix issues on check in page
>
>This patch fixes translatability issues on checkin page, due to sentence splitting by html tags at
>several places and ambiguous word 'to'.
>
>Additionally, fix message related to syspref AllowReturnToBranch set to 'only the library where the
>item is checked out from' (it wrongly displays the home library instead of the holding library),
>and streamline the display of similar messages to look more consistent.
>
>To test:
>- Apply patch
>- Go to Home > Circulation > Check in
>- Do check ins with different expected results / messages
>- Verify that the messages are meaningful and display nicely
>- Play with items checked out / checked in at different branches (home branch, holding branch, other
>  branch) and different settings for syspref 'AllowREturnToBranch' and verify that the messages display
>  properly (with correct home rsp. holding branch)
>- Carfully review code changes.
>---
> circ/returns.pl                                    |    2 +
> .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   61 +++++++++++++-------
> 2 files changed, 43 insertions(+), 20 deletions(-)
>
>diff --git a/circ/returns.pl b/circ/returns.pl
>index 893accd..25e058f 100755
>--- a/circ/returns.pl
>+++ b/circ/returns.pl
>@@ -280,6 +280,7 @@ if ($barcode) {
>     $template->param(
>         title            => $biblio->{'title'},
>         homebranch       => $biblio->{'homebranch'},
>+        holdingbranch    => $biblio->{'holdingbranch'},
>         returnbranch     => $returnbranch,
>         author           => $biblio->{'author'},
>         itembarcode      => $biblio->{'barcode'},
>@@ -373,6 +374,7 @@ if ( $messages->{'NeedsTransfer'} ){
> if ( $messages->{'Wrongbranch'} ){
>     $template->param(
>         wrongbranch => 1,
>+        rightbranch => $messages->{'Wrongbranch'}->{'Rightbranch'},
>     );
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index fab2402..69cc2cb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -132,7 +132,11 @@ $(document).ready(function () {
> [% END %]
> 
> [% IF ( collectionItemNeedsTransferred ) %]
>- <div id="rotating-collection" class="dialog message">This item is part of a rotating collection and needs to be transferred to [% collectionBranch %]</div>
>+ <div id="rotating-collection" class="dialog message">
>+        <h3>Please transfer to: [% collectionBranch %]</h3>
>+            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
>+            <p>This item is part of a rotating collection.</p>
>+</div>
> [% END %]
> 
> 
>@@ -164,11 +168,19 @@ $(document).ready(function () {
> [% END %]
> 
> [% IF ( wrongbranch ) %]
>-<div class="dialog alert"><h3>Cannot check in</h3><p>This item must be checked in at its home library. <strong>NOT CHECKED IN</strong></p>
>-</div>
>+    <div class="dialog alert"><h3>Cannot check in</h3>
>+        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
>+        </p><strong>NOT CHECKED IN</strong></p>
>+        <p>This item must be checked in at following library: <strong>[% Branches.GetName( rightbranch ) %]</strong></p>
>+    </div>
> [% END %]
> 
>-[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% Branches.GetName( TransferWaitingAt ) %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></h3>
>+[% IF ( WrongTransfer ) %]
>+    <div id="return2" class="dialog message">
>+        
>+        <h3>Please return to: [% Branches.GetName( TransferWaitingAt ) %]</h3>
>+            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
>+        <ul><li><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print transfer slip</a></li><li><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></li></ul>
> [% IF ( wborcnum ) %]<h5>Hold for:</h5>
>         <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
>             [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
>@@ -201,7 +213,8 @@ $(document).ready(function () {
> 	
> 
>     <div id="hold-found1" class="dialog message audio-alert-action">
>-        <h3>Hold found (item is already waiting):  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
>+        <h3>Hold found (item is already waiting)</h3>
>+        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
>         [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
>         <h4>Hold for:</h4>
> 			<ul>
>@@ -249,7 +262,8 @@ $(document).ready(function () {
>     [% IF ( diffbranch ) %]
> 		
>         <div id="transfer-needed" class="dialog message audio-alert-action">
>-		<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
>+            <h3>Hold needing transfer found</h3>
>+                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
>                 <h4>Hold for: </h4>
>                     <ul>
>                         <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
>@@ -293,7 +307,9 @@ $(document).ready(function () {
>     [% IF ( transfer ) %]
>     
>         <div id="return1" class="dialog message audio-alert-action">
>-            <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% Branches.GetName( returnbranch ) %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip'); return true;">Print slip</a> )</h3>
>+            <h3>Please return to: [% Branches.GetName( returnbranch ) %]</h3>
>+            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
>+            <ul><li><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip'); return true;">Print slip</a> )</li></ul>
>         </div>
>     [% END %]
> 
>@@ -355,7 +371,8 @@ $(document).ready(function () {
> 	
> 
>     <div id="hold-found2" class="dialog message audio-alert-action">
>-      <h3>Hold found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
>+      <h3>Hold found</h3>
>+          <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
>         [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
>         <h5>Hold for:</h5>
> 		<ul>
>@@ -407,21 +424,24 @@ $(document).ready(function () {
> [% IF ( errmsgloop ) %]
>     <div class="dialog alert audio-alert-warning">
>         <h3>Check in message</h3>
>+        [% IF itembiblionumber %]
>+            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
>+        [% END %]
>         [% FOREACH errmsgloo IN errmsgloop %]
>                     [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
>                         <p class="problem">
>-                            Not for loan status updated
>-                            from
>+                            Not for loan status updated.
>+                            <br />Old value:
>                             [% IF errmsgloo.NotForLoanStatusUpdated.from %]
>-                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]
>+                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %].
>                             [% ELSE %]
>-                                being available for loan
>+                                Available for loan.
>                             [% END %]
>-                            to
>+                            <br />New value:
>                             [% IF errmsgloo.NotForLoanStatusUpdated.to %]
>-                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %]
>+                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %].
>                             [% ELSE %]
>-                                being available for loan
>+                                Available for loan.
>                             [% END %]
>                         </p>
>                     [% END %]
>@@ -442,25 +462,26 @@ $(document).ready(function () {
>                         [% IF ( LostItemFeeRefunded ) %]
>                             <p class="problem">A refund has been applied to the borrowing patron's account.</p>
>                         [% ELSE %]
>-                            <p class="problem">Any lost item fees for this item will remain on the patron's account</p>
>+                            <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
>                         [% END %]
>                     [% END %]
>                     [% IF ( errmsgloo.withdrawn ) %]
>                         [% IF BlockReturnOfWithdrawnItems %]
>                            <h5>Cannot check in</h5>
>-                           <p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p>
>+                           <p><strong>NOT CHECKED IN</strong></p>
>+                           <p class="problem">Item is withdrawn.</p>
>                         [% ELSE %]
>                            <p class="problem">Item is withdrawn.</p>
>                         [% END %]
>                     [% END %]
>                     [% IF ( errmsgloo.debarred ) %]
>-                        <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %] </p>
>+                        <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p>
>                     [% END %]
>                     [% IF ( errmsgloo.prevdebarred ) %]
>-                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %]</p>
>+                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
>                     [% END %]
>                     [% IF ( errmsgloo.foreverdebarred ) %]
>-                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction</p>
>+                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
>                     [% END %]
> 
>             [% END %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 15355: 45610 | 45611 | 45892 | 46353