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

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 6fd722c..fba51ee 100644 (file)
--- 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>