From c80f0882bdb097cf74a8e6d20274949506d79e3c Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 10 Dec 2023 15:45:28 +0000 Subject: [PATCH] Bug 35531: Add context for translating gender option "Other" To test: * Apply patch * Verify the option "Other" for gender is correctly displayed when: * Editing a patron record in the staff interface * Viewing the 'Details' tab of a patron in staff interface * Triggering a "duplicate" patron warning and looking at the details of the existing patron record * Self registering a patron in the OPAC * Viewing 'Personal details' tab in the OPAC for a registered patron * If you are using ktd, run: gulp po:update --lang de-DE * Verify string "gender" appears with the occurences of "Other"and "Other:" in misc/translator/Koha-messages.pot Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer (cherry picked from commit 5f6c0f0c3e896f72c086bfacec1501ee3d72fbe0) Signed-off-by: Fridolin Somers --- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 6 +++--- .../prog/en/modules/members/moremember-brief.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 809a314706..3bc9624da7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -439,9 +439,9 @@ legend:hover { [% END %] [% IF ( other ) %] - + [% ELSE %] - + [% END %] [% IF ( none ) %] @@ -451,7 +451,7 @@ legend:hover { [% ELSE %] - + [% END # /UNLESS ( opduplicate )%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index ddaec613c9..bec0c9c4fa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -41,7 +41,7 @@ [% UNLESS ( I ) %] [% IF ( patron.initials ) %]
  • Initials: [% patron.initials | html %]
  • [% END %] [% IF ( patron.dateofbirth ) %]
  • Date of birth:[% patron.dateofbirth | $KohaDates %]
  • [% END %] - [% IF ( patron.sex ) %]
  • Gender:[% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSIF ( patron.sex == 'O' ) %]Other[% ELSE %][% patron.sex | html %][% END %]
  • [% END %] + [% IF ( patron.sex ) %]
  • Gender:[% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSIF ( patron.sex == 'O' ) %][% tp('gender', 'Other') | html %][% ELSE %][% patron.sex | html %][% END %]
  • [% END %] [% END %] [% IF guarantees %] 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 18ca249765..35e1d6b43a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -187,7 +187,7 @@ [% IF ( patron.sex ) %]
  • Gender: - [% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSIF (patron.sex == 'O' ) %]Other[% ELSE %][% patron.sex | html %][% END %] + [% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSIF (patron.sex == 'O' ) %][% tp('gender', 'Other') | html %][% ELSE %][% patron.sex | html %][% END %]
  • [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index 986448629b..89c6ab15a9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -7,6 +7,7 @@ [% USE KohaDates %] [% USE Math %] [% USE AdditionalContents %] +[% PROCESS 'i18n.inc' %] [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] [% SET userupdateview = 1 %] @@ -432,7 +433,7 @@ [% END %] - + [% IF borrower.sex == 'O' %] [% ELSE %] -- 2.39.5