@@ -, +, @@ --- .../prog/en/modules/members/memberentrygen.tt | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -494,11 +494,12 @@ [% END %] [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %] - [% 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 %] [% END # nostreet && nocity etc group%] [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %] @@ -587,20 +588,24 @@ [% IF ( step_6 ) %] [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %] - [% IF Koha.Preference( 'AddressFormat' ) %] - [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] - [% ELSE %] - [% INCLUDE 'member-alt-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 %] + [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %] [% END %] [% IF ( step_2 ) %] [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %] - [% IF Koha.Preference( 'AddressFormat' ) %] - [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] - [% ELSE %] - [% INCLUDE 'member-alt-contact-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 %] + [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %] [% END %] --