@@ -, +, @@
---
.../intranet-tmpl/prog/en/modules/members/moremember-brief.tt | 9 +++++----
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 10 +++++-----
members/moremember.pl | 4 +---
3 files changed, 11 insertions(+), 12 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Check duplicate patron
[% INCLUDE 'doc-head-close.inc' %]
@@ -47,7 +48,7 @@
[% IF ( emailpro ) %]Secondary email: [% emailpro %][% END %]
[% END %]
Initials: [% initials %]
- Date of birth:[% dateofbirth %]
+ Date of birth:[% dateofbirth | $KohaDates %]
Gender:[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %][% END %]
[% IF ( isguarantee ) %]
[% IF ( guaranteeloop ) %]
@@ -70,12 +71,12 @@
Card number: [% cardnumber %]
Borrowernumber: [% borrowernumber %]
Category: [% description %] ([% categorycode %])
- Registration date: [% dateenrolled %]
+ Registration date: [% dateenrolled | $KohaDates %]
Expiration date:
[% IF ( was_renewed ) %]
- [% dateexpiry %]
+ [% dateexpiry | $KohaDates %]
[% ELSE %]
- [% dateexpiry %]
+ [% dateexpiry | $KohaDates %]
[% END %]
Library: [% branchname %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -166,7 +166,7 @@ function validate1(date) {
[% IF ( unknowuser ) %]
This patron does not exist.
[% ELSE %]
- [% IF ( was_renewed ) %]Patron's account has been renewed until [% dateexpiry %]
[% END %]
+ [% IF ( was_renewed ) %]Patron's account has been renewed until [% dateexpiry | $KohaDates %]
[% END %]
[% IF ( flagged ) %]
@@ -225,7 +225,7 @@ function validate1(date) {
[% IF ( emailpro ) %]
Secondary email: [% emailpro %][% END %]
[% END %]
[% IF ( initials ) %]
Initials: [% initials %][% END %]
- [% IF ( dateofbirth ) %]
Date of birth:[% dateofbirth %][% END %]
+ [% IF ( dateofbirth ) %]
Date of birth:[% dateofbirth | $KohaDates %][% END %]
[% IF ( sex ) %]
Gender:
[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
[% END %][% END %]
@@ -337,13 +337,13 @@ function validate1(date) {
Card number: [% cardnumber %]
Borrowernumber: [% borrowernumber %]
Category: [% description %] ([% categorycode %])
-
Registration date: [% dateenrolled %]
+
Registration date: [% dateenrolled | $KohaDates %]
Expiration date:
[% IF ( was_renewed ) %]
- [% dateexpiry %]
+ [% dateexpiry | $KohaDates %]
[% ELSE %]
- [% dateexpiry %]
+ [% dateexpiry | $KohaDates %]
[% END %]
--- a/members/moremember.pl
+++ a/members/moremember.pl
@@ -135,9 +135,7 @@ foreach (qw(dateenrolled dateexpiry dateofbirth)) {
$data->{$_} = '';
next;
}
- $userdate = output_pref({ dt => dt_from_string( $userdate ), dateonly => 1 });
- $data->{$_} = $userdate || '';
- $template->param( $_ => $userdate );
+ $template->param( $_ => dt_from_string( $userdate ) );
}
$data->{'IS_ADULT'} = ( $data->{'categorycode'} ne 'I' );
--