From 691fab4b9462ab3da4f45d2d91047e292410ed16 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 9 Jun 2022 16:23:49 +0000 Subject: [PATCH] Bug 10950: Display pronouns field Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/includes/patron-title.inc | 9 ++++++--- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc index e047700963..7ecbc4dbd0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -6,6 +6,7 @@ [%- SET data.category_type = patron.category.category_type -%] [%- SET data.surname = patron.surname -%] [%- SET data.othernames = patron.othernames -%] + [%- SET data.pronouns = patron.pronouns -%] [%- SET data.firstname = patron.firstname -%] [%- SET data.cardnumber = patron.cardnumber -%] [%- SET data.borrowernumber = patron.borrowernumber -%] @@ -14,6 +15,7 @@ [%- SET data.category_type = borrower.category_type -%] [%- SET data.surname = borrower.surname -%] [%- SET data.othernames = borrower.othernames -%] + [%- SET data.pronouns = borrower.pronouns -%] [%- SET data.firstname = borrower.firstname -%] [%- SET data.cardnumber = borrower.cardnumber -%] [%- SET data.borrowernumber = borrower.borrowernumber -%] @@ -22,6 +24,7 @@ [%- SET data.category_type = category_type -%] [%- SET data.surname = surname -%] [%- SET data.othernames = othernames -%] + [%- SET data.othernames = pronouns -%] [%- SET data.firstname = firstname -%] [%- SET data.cardnumber = cardnumber -%] [%- SET data.borrowernumber = borrowernumber -%] @@ -59,11 +62,11 @@ [%- END -%] [%- IF display_patron_name -%] [%- IF data.category_type == 'I' -%] - [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] + [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] [% IF data.pronouns %]([% data.pronouns | html %])[% END %] [%- ELSIF invert_name -%] - [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%] + [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%][% IF data.pronouns %]([% data.pronouns | html%])[% END %] [%- ELSE -%] - [% data.title | $raw %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] + [% data.title | $raw %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] [% IF data.pronouns %]([% data.pronouns | html %])[% END %] [%- END -%] [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%] [%- ELSIF display_cardnumber -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 8a3ce8fab9..39c228563c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -114,7 +114,8 @@ [% END %] - [% IF ( patron.othernames ) %]“[% patron.othernames | html %]”[% END %] + [% IF ( patron.othernames ) %]
“[% patron.othernames | html %]”
[% END %] + [% IF ( patron.pronouns ) %]
“[% patron.pronouns | html %]”
[% END %]
    -- 2.20.1