Attachment 100050 Details for Bug 15400 – Bug 15400: (follow-up) Restore 'years' string, remove untranslatable string

[patch] Bug 15400: (follow-up) Restore 'years' string, remove untranslatable string

Bug-15400-follow-up-Restore-years-string-remove-un.patch (text/plain), 3.42 KB, created by Josef Moravec on 2020-03-03 19:25:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2020-03-03 19:25:57 UTC

Size: 3.42 KB

patch

obsolete

>From 37fba47e4a23f8428d4a059d9c0a218bbb668c25 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Mon, 11 Mar 2019 14:25:46 +0000
>Subject: [PATCH] Bug 15400: (follow-up) Restore 'years' string, remove
> untranslatable string
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> circ/ysearch.pl                                          | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc | 7 ++++++-
> koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc  | 7 ++++---
> 3 files changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/circ/ysearch.pl b/circ/ysearch.pl
>index 71b48ca4f3..3e31f7f852 100755
>--- a/circ/ysearch.pl
>+++ b/circ/ysearch.pl
>@@ -85,7 +85,7 @@ while ( my $b = $borrowers_rs->next ) {
>         firstname      => $b->firstname  // '',
>         cardnumber     => $b->cardnumber // '',
>         dateofbirth    => format_sqldatetime($b->dateofbirth, undef, undef, 1) // '',
>-        age            => $b->get_age    // 'Age unknown',
>+        age            => $b->get_age    // '',
>         address        => $b->address    // '',
>         city           => $b->city       // '',
>         zipcode        => $b->zipcode    // '',
>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 ac6e2b80d5..1710e6c49f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
>@@ -100,9 +100,14 @@
>                             // Display card number in parentheses if it exists
>                             cardnumber = " (" + item.cardnumber + ") ";
>                         }
>+                        var itemString = "<a href=\"" + item.link + "\">" + item.surname + ", " + item.firstname + cardnumber + " <small>";
>+                        if( item.dateofbirth ) {
>+                            itemString += item.dateofbirth + " (" + item.age + " " +  _("years") + "), ";
>+                        }
>+                        itemString += item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>";
>                         return $( "<li></li>" )
>                         .data( "ui-autocomplete-item", item )
>-                        .append( "<a href=\"" + item.link + "\">" + item.surname + ", " + item.firstname + cardnumber + " <small>" + item.dateofbirth + " (" + item.age + ") " + item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>" )
>+                        .append( itemString )
>                         .appendTo( ul );
>                     };
>                 }
>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 899ce163c3..4dc3c333f2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc
>@@ -1,8 +1,9 @@
> [%- USE KohaDates -%]
>+[%- USE I18N -%]
> [%- IF ( patron ) -%]
>     [%- IF ( patron.dateofbirth ) -%]
>-        [% patron.dateofbirth | $KohaDates -%]
>-        [%- IF ( patron.get_age ) %] ([% patron.get_age | html %])
>-        [%- ELSIF ( patron.age ) %] ([% patron.age | html %])[% END -%]
>+        [%- patron.dateofbirth | $KohaDates %]
>+        [%- SET age = (patron.get_age != undef) ? patron.get_age : patron.age -%]
>+        [% I18N.tnx('({age} year)', '({age} years)', age, { age => age }) | html %]
>    [%- 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