From 012a1544f0edef248144a2ec99eafef1f8c88496 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 14 Apr 2021 11:35:17 +0000
Subject: [PATCH] Bug 27830: (follow-up) Merge DE and FR address formats

Library addresses don't include the use of "Street Type" and "Street
Number." DE and FR address formats differ only in the position of street
type and number in the address sequence.

This patch merges DE and FR address markup and uses the unified block if
the address format system preference ISN'T "us".

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 953088f8167c545318fe63d41912eda657cde705)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../en/includes/display-library-address.inc   | 61 +++++--------------
 1 file changed, 14 insertions(+), 47 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc
index 4b0e39e638..5d129115c1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc
@@ -3,10 +3,10 @@
 [%~ BLOCK 'display-library-address' ~%]
     [%~ SET line_break = "<br/>" ~%]
     [%~ 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 ) ~%]
         <div class="branchcity">
-            <span property="addressLocality">
-                [%~ library.branchcity |html  ~%]
-            </span>
-            [%~ IF ( library.branchstate ) %]
-                <span property="addressRegion">
-                    , [% library.branchstate |html  ~%]
-                </span>
-            [%~ END ~%]
+            <span property="addressLocality">[%~ library.branchcity |html  ~%]</span>
+            [%~ IF ( library.branchstate ) %]<span property="addressRegion">, [% library.branchstate |html  ~%]</span>[%~ END ~%]
             [%~ IF ( library.branchzip ) %]
                 <span property="postalCode">
-                    [%~ " " _ library.branchzip |html  ~%]
+                    [%~ library.branchzip |html  ~%]
                 </span>
             [%~ 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 ) ~%]
         <span property="streetAddress">
             [%~ IF ( library.branchaddress1 ) ~%]
-                <div class="branchaddress1">
+                <span class="branchaddress1">
                     [%~ library.branchaddress1 | html ~%]
-                </div>
+                </span>
+                [% line_break | $raw %]
             [%~ END ~%]
             [%~ IF ( library.branchaddress2 ) ~%]
-                <div class="branchaddress2">
+                <span class="branchaddress2">
                     [%~ library.branchaddress2 | html ~%]
-                </div>
+                </span>
+                [% line_break | $raw %]
             [%~ END ~%]
             [%~ IF ( library.branchaddress3 ) ~%]
                 <span class="branchaddress3">
@@ -76,38 +72,9 @@
             [%~ END ~%]
         </span>
     [%~ END ~%]
-    [%~ IF ( library.branchcity ) ~%]
-        <div class="branchcity">
-            [%~ IF ( library.branchzip ) ~%]<span property="postalCode">[%~ library.branchzip | html %]</span> [% END ~%]<span property="addressLocality">[%~ library.branchcity | html ~%]</span>[%~ IF ( library.branchstate ) ~%][% line_break | $raw %][%~ library.branchstate | html ~%][%~ END ~%]
-            [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %][%~ library.branchcountry | html ~%][%~ END ~%]
-        </div>
-    [%~ END ~%]
-[%~ END ~%]
-
-[%~ BLOCK 'display-library-address-fr' ~%]
-    [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%]
-        [%~ IF ( library.branchaddress1 ) ~%]
-            <span class="branchaddress1">
-                [%~ library.branchaddress1 | html ~%]
-            </span>
-            [% line_break | $raw %]
-        [%~ END ~%]
-        [%~ IF ( library.branchaddress2 ) ~%]
-            <span class="branchaddress2">
-                [%~ library.branchaddress2 | html ~%]
-            </span>
-            [% line_break | $raw %]
-        [%~ END ~%]
-        [%~ IF ( library.branchaddress3 ) ~%]
-            <span class="branchaddress3">
-                [%~ library.branchaddress3 | html ~%]
-            </span>
-            [% line_break | $raw %]
-        [%~ END ~%]
-    [%~ END ~%]
     [%~ IF ( library.branchcity ) ~%]
         <span class="branchcity">
-            [%~ IF ( library.branchzip ) ~%][%~ library.branchzip | html %] [% END ~%][%~ library.branchcity | html ~%][%~ IF ( library.branchstate ) ~%][% line_break | $raw %]<span property="addressRegion">[%~ library.branchstate | html ~%]</span>[%~ END ~%]
+            [%~ IF ( library.branchzip ) ~%]<span property="postalCode">[%~ library.branchzip | html %]</span> [% END ~%]<span property="addressLocality">[%~ library.branchcity | html ~%]</span>[%~ IF ( library.branchstate ) ~%][% line_break | $raw %]<span property="addressRegion">[%~ library.branchstate | html ~%]</span>[%~ END ~%]
             [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %]<span property="addressCountry">[%~ library.branchcountry | html ~%]</span>[%~ END ~%]
         </span>
     [%~ END ~%]
-- 
2.39.5