@@ -, +, @@
commit dcd1f5d48c758aee17b6c6f069c6146b42efe117
Bug 13618: Add html filters to all the variables
- [% 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 %]
---
.../prog/en/includes/circ-menu.inc | 9 ++++-----
.../prog/en/modules/members/memberentrygen.tt | 18 ++++++++++++------
2 files changed, 16 insertions(+), 11 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -29,11 +29,10 @@
[% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
- [% SWITCH Koha.Preference( 'AddressFormat' ) %]
- [% CASE 'de' %]
- [% INCLUDE 'member-display-address-style-de.inc' %]
- [% CASE # us %]
- [% INCLUDE 'member-display-address-style-us.inc' %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
+ [% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% IF ( patron.phone || patron.mobile || patron.phonepro ) %]-
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -561,6 +561,8 @@ legend:hover {
[% 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 %]
[% END # /UNLESS nostreet && nocity etc group%]
@@ -726,17 +728,21 @@ legend:hover {
[% IF ( step_6 ) %]
[% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
- [% SWITCH Koha.Preference( 'AddressFormat' ) %]
- [% CASE 'de' %]
- [% INCLUDE 'member-alt-address-style-de.inc' %]
- [% CASE # us %]
- [% INCLUDE 'member-alt-address-style-us.inc' %]
- [% END %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
+ [% INCLUDE 'member-main-address-style-us.inc' %]
+ [% END %]
[% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
[% END # /IF ( step_6 ) %]
[% IF ( step_2 ) %]
[% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
+ [% 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-alt-contact-style-de.inc' %]
--