Koha/koha-tmpl/intranet-tmpl/prog
Jonathan Druart 9ac2ddda0b
Bug 25069: Fix AddressFormat="fr" behavior
Something went wrong during a rebase of bug 13618
  commit dcd1f5d48c
  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: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
2020-04-14 08:25:31 +01:00
..
css Bug 23173: (follow-up) Display available partners 2020-04-06 11:04:59 +01:00
en Bug 25069: Fix AddressFormat="fr" behavior 2020-04-14 08:25:31 +01:00
img Bug 7882: Add ability to move and reorder fields in MARC editor 2020-01-03 16:27:59 +00:00
js Bug 23173: (follow-up) Display available partners 2020-04-06 11:04:59 +01:00
pdf Bug 5016: Fix some translation issues with English PDF order templates 2020-02-19 11:26:41 +00:00
sound