From e7f29c1c0743b474d8ccddc95ce5e682f38446a1 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Thu, 18 Apr 2019 09:27:30 +0000 Subject: [PATCH] Bug 15400: (follow-up) Add class to years span --- koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index 708feafeae..b0897c3db5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -105,7 +105,7 @@ obj._renderItem = function( ul, item ) { var itemString = "" + item.surname + ", " + item.firstname + " (" + item.cardnumber + ") "; if( item.dateofbirth ) { - itemString += item.dateofbirth + " (" + item.age + " " + _("years") + "), "; + itemString += item.dateofbirth + " (" + item.age + " " + _("years") + "), "; } itemString += item.address + " " + item.city + " " + item.zipcode + " " + item.country + ""; return $( "
  • " ) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc index 4dc3c333f2..b380939072 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc @@ -1,9 +1,10 @@ [%- USE KohaDates -%] [%- USE I18N -%] +[%- USE raw -%] [%- IF ( patron ) -%] [%- IF ( patron.dateofbirth ) -%] [%- patron.dateofbirth | $KohaDates %] [%- SET age = (patron.get_age != undef) ? patron.get_age : patron.age -%] - [% I18N.tnx('({age} year)', '({age} years)', age, { age => age }) | html %] + [% I18N.tnx('({age}{span_start} year{span_end})', '({age}{span_start} years{span_end})', age, { age => age, span_start => '', span_end => '' }) | $raw %] [%- END -%] [%- END -%] -- 2.11.0