From ecbf63cceec76f25cc1b9ef59d635e926b256b6c 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 Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Andrew Fuerste-Henry --- .../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 d0a3267cf5..59f4ff489d 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.middle_name = patron.middle_name -%] [%- SET data.cardnumber = patron.cardnumber -%] @@ -15,6 +16,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.middle_name = borrower.middle_name -%] [%- SET data.cardnumber = borrower.cardnumber -%] @@ -24,6 +26,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.middle_name = middle_name -%] [%- SET data.cardnumber = cardnumber -%] @@ -64,11 +67,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.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%] + [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.middle_name %] [% data.middle_name | 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.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] + [% data.title | $raw %][%- data.firstname | html %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% 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 2dda38be50..3330002d04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -109,7 +109,8 @@ [% END %] - [% IF ( patron.othernames ) %]“[% patron.othernames | html %]”[% END %] + [% IF ( patron.othernames ) %]
“[% patron.othernames | html %]”
[% END %] + [% IF ( patron.pronouns ) %]
“[% patron.pronouns | html %]”
[% END %]
    -- 2.30.2