From 2d96436ab4842524626e1d910ea8eaa7090a14fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Tue, 5 Jul 2016 07:14:26 +0200 Subject: [PATCH] [SIGNED-OFF]Bug 16871: Translatability: Avoid [%%-problem and fix related sentence splitting in catalogue/detail.tt In koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt, fix line splitted TT directives and sentence splitting leading to translatability problems. (See first comment). To test: - Apply patch - Go to detail pages of biblios with waiting holds - Verify that messages in column 'Status' are OK - Examine code in patch to make sure that the simplification in logic makes sense and that no TT directive is splitted - Bonus test: - Go to folder misc/translator. Run perl translate create xx-XX - Verify that monster mentioned in first comment no longer exists (in po/xx-XX-staff-prog.po) Signed-off-by: Hector Castro Works as advertised --- .../prog/en/modules/catalogue/detail.tt | 30 ++++---------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index e8de754..26c7070 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -691,41 +691,21 @@ function verify_images() { [% IF ( item.reservedate ) %] [% IF ( item.waitingdate ) %] - Waiting + Waiting since [% item.waitingdate | $KohaDates %] at [% item.ExpectedAtLibrary %]. [% ELSE %] - Item-level hold + Item-level hold (placed [% item.reservedate | $KohaDates %]) for delivery at [% item.ExpectedAtLibrary %]. [% END %] [% IF ( canreservefromotherbranches ) %] - for + Hold for: [% IF ( item.hidepatronname ) %] [% item.Reservedcardnumber %] [% ELSE %] - [% item.ReservedForFirstname %] [% item.ReservedForSurname %] + [% item.ReservedForFirstname _ item.ReservedForSurname _ " (" _ item.Reservedcardnumber _ ")" %] [% END %] [% END %] - [% IF ( item.waitingdate ) %] - at[% ELSE %]for delivery at - [% END %] - [% item.ExpectedAtLibrary %] - [% IF ( item.waitingdate ) %] - since [% item.waitingdate | $KohaDates %] - [% ELSE %] - [% IF ( item.reservedate ) %] - (placed [% item.reservedate | $KohaDates %]) - [% END %] - [% END %] [% END %] - [% UNLESS ( - item.itemnotforloan - or item.notforloan_per_itemtype - or item.onloan - or item.itemlost - or item.withdrawn - or item.damaged - or item.transfertwhen - or item.reservedate - ) %] + [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || item.reservedate ) %] Available [% END %] -- 1.7.10.4