From b7e9de9a436d59c811f459758094b9bb1ab86a59 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 6 Apr 2020 12:44:13 +0200 Subject: [PATCH] Bug 25069: Fix AddressFormat="fr" behavior Something went wrong during a rebase of bug 13618 commit dcd1f5d48c758aee17b6c6f069c6146b42efe117 Bug 13618: Add html filters to all the variables Several changes related to AddressFormat are wrong: - [% IF Koha.Preference( 'AddressFormat' ) %] - [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] - [% ELSE %] - [% INCLUDE 'member-main-address-style-us.inc' %] - [% END %] + [% SWITCH Koha.Preference( 'AddressFormat' ) %] + [% CASE 'de' %] + [% INCLUDE 'member-main-address-style-de.inc' %] + [% CASE # us %] + [% INCLUDE 'member-main-address-style-us.inc' %] + [% END %] Test plan: Create a patron with all the address fields filled Play with the 3 option values of AddressFormat, and confirm that the address is displayed correctly on the patron's view, and in the patron module (top left) Signed-off-by: Joy Nelson --- .../prog/en/includes/circ-menu.inc | 9 ++++---- .../prog/en/modules/members/memberentrygen.tt | 21 +++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 95ace5e248..1cfcb4fe4c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -29,11 +29,10 @@