From 015e20138a7a400d0da30b0a771a94eede673c05 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Tue, 26 Jan 2016 16:33:49 +0100
Subject: [PATCH] Bug 15667: Fix date and branch formatting of messages in
 patron account display

This patch fixes the date and branch formatting of messages in patron
account display.

To verify:
Add a new message to a patron account from the 'checkouts' tab in staff,
the displayed date is not correctly formatted and the branch displays as code
instead as branch name

To test:
Apply patch, verify that the messages and branch names are properly formatted.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. The message dates in checkouts tab follow dateformat sypref

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 6fd722cb07..fba51eebf5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -844,8 +844,8 @@ No patron matched <span class="ex">[% message %]</span>
 			[% FOREACH lib_messages_loo IN lib_messages_loop %]
 				<li>
 					<span class="circ-hlt">
-						[% lib_messages_loo.message_date_formatted %]
-						[% lib_messages_loo.branchcode %]
+                                                [% lib_messages_loo.message_date_formatted  | $KohaDates %]
+                                                [% Branches.GetName( lib_messages_loo.branchcode ) %]
 						<i>"[% lib_messages_loo.message %]"</i>
 					</span>
 					[% IF ( lib_messages_loo.can_delete ) %]
@@ -858,7 +858,7 @@ No patron matched <span class="ex">[% message %]</span>
 				</li>
 			[% END %]
 			[% FOREACH bor_messages_loo IN bor_messages_loop %]
-				<li><span class="">[% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] <i>"[% bor_messages_loo.message %]"</i></span> [% IF ( bor_messages_loo.can_delete ) %]<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&amp;borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a>
+                            <li><span class="">[% bor_messages_loo.message_date_formatted  | $KohaDates %] [% Branches.GetName( bor_messages_loo.branchcode ) %] <i>"[% bor_messages_loo.message %]"</i></span> [% IF ( bor_messages_loo.can_delete ) %]<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&amp;borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a>
                 [% ELSIF ( all_messages_del ) %]
                     <a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&amp;borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a>
                 [% END %]</li>
-- 
2.39.5