@@ -, +, @@
---
.../en/includes/display-library-address.inc | 61 +++++-----------------
1 file changed, 14 insertions(+), 47 deletions(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc
@@ -3,10 +3,10 @@
[%~ BLOCK 'display-library-address' ~%]
[%~ SET line_break = "
" ~%]
[%~ IF no_line_break %][% SET line_break = " " %][% END ~%]
- [%~ IF Koha.Preference( 'AddressFormat' ) ~%]
- [%~ PROCESS "display-library-address-${ Koha.Preference( 'AddressFormat' ) }" ~%]
- [%~ ELSE ~%]
+ [%~ IF Koha.Preference( 'AddressFormat' ) == "us" ~%]
[%~ PROCESS 'display-library-address-us' ~%]
+ [%~ ELSE ~%]
+ [%~ PROCESS 'display-library-address-de-fr' ~%]
[%~ END ~%]
[%~ END ~%]
@@ -33,17 +33,11 @@
[%~ END ~%]
[%~ IF ( library.branchcity ) ~%]
-
- [%~ library.branchcity |html ~%]
-
- [%~ IF ( library.branchstate ) %]
-
- , [% library.branchstate |html ~%]
-
- [%~ END ~%]
+
[%~ library.branchcity |html ~%]
+ [%~ IF ( library.branchstate ) %]
, [% library.branchstate |html ~%][%~ END ~%]
[%~ IF ( library.branchzip ) %]
- [%~ " " _ library.branchzip |html ~%]
+ [%~ library.branchzip |html ~%]
[%~ END ~%]
[%~ IF ( library.branchcountry ) %]
@@ -55,18 +49,20 @@
[%~ END ~%]
[%~ END ~%]
-[%~ BLOCK 'display-library-address-de' ~%]
+[%~ BLOCK 'display-library-address-de-fr' ~%]
[%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
[%~ IF ( library.branchaddress1 ) ~%]
-
+
[%~ library.branchaddress1 | html ~%]
-
+
+ [% line_break | $raw %]
[%~ END ~%]
[%~ IF ( library.branchaddress2 ) ~%]
-
+
[%~ library.branchaddress2 | html ~%]
-
+
+ [% line_break | $raw %]
[%~ END ~%]
[%~ IF ( library.branchaddress3 ) ~%]
@@ -77,37 +73,8 @@
[%~ END ~%]
[%~ IF ( library.branchcity ) ~%]
-
- [%~ IF ( library.branchzip ) ~%][%~ library.branchzip | html %] [% END ~%][%~ library.branchcity | html ~%][%~ IF ( library.branchstate ) ~%][% line_break | $raw %][%~ library.branchstate | html ~%][%~ END ~%]
- [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %][%~ library.branchcountry | html ~%][%~ END ~%]
-
- [%~ END ~%]
-[%~ END ~%]
-
-[%~ BLOCK 'display-library-address-fr' ~%]
- [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
- [%~ IF ( library.branchaddress1 ) ~%]
-
- [%~ library.branchaddress1 | html ~%]
-
- [% line_break | $raw %]
- [%~ END ~%]
- [%~ IF ( library.branchaddress2 ) ~%]
-
- [%~ library.branchaddress2 | html ~%]
-
- [% line_break | $raw %]
- [%~ END ~%]
- [%~ IF ( library.branchaddress3 ) ~%]
-
- [%~ library.branchaddress3 | html ~%]
-
- [% line_break | $raw %]
- [%~ END ~%]
- [%~ END ~%]
- [%~ IF ( library.branchcity ) ~%]
- [%~ IF ( library.branchzip ) ~%][%~ library.branchzip | html %] [% END ~%][%~ library.branchcity | html ~%][%~ IF ( library.branchstate ) ~%][% line_break | $raw %][%~ library.branchstate | html ~%][%~ END ~%]
+ [%~ IF ( library.branchzip ) ~%][%~ library.branchzip | html %] [% END ~%][%~ library.branchcity | html ~%][%~ IF ( library.branchstate ) ~%][% line_break | $raw %][%~ library.branchstate | html ~%][%~ END ~%]
[%~ IF ( library.branchcountry ) ~%][% line_break | $raw %][%~ library.branchcountry | html ~%][%~ END ~%]
[%~ END ~%]
--