Attachment 88278 Details for Bug 15400 – Bug 15400: (follow-up) Add class to years span

[patch] Bug 15400: (follow-up) Add class to years span

Bug-15400-follow-up-Add-class-to-years-span.patch (text/plain), 2.23 KB, created by Josef Moravec on 2019-04-18 09:28:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2019-04-18 09:28:55 UTC

Size: 2.23 KB

patch

obsolete

>From e7f29c1c0743b474d8ccddc95ce5e682f38446a1 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>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 = "<a>" + 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 + "</a>";
> return $( "<li></li>" )
>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

Actions: View | Diff | Splinter Review

Attachments on bug 15400: 45882 | 46935 | 81892 | 82714 | 85432 | 85479 | 85494 | 85495 | 85496 | 85497 | 86457 | 86458 | 86459 | 86460 | 88274 | 88275 | 88276 | 88277 | 88278 | 88845 | 88846 | 88977 | 88978 | 88979 | 88980 | 88981 | 100047 | 100048 | 100049 | 100050 | 100051 | 100065 | 100066 | 100067 | 100068 | 100069 | 100118 | 103373 | 106133 | 106134 | 106135 | 106136 | 106137 | 106138 | 106139 | 106140 | 106307