From e6f91b406fcfa9229d4f8b153a5681e281c60797 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 11 Jan 2016 10:40:27 +0000
Subject: [PATCH] Bug 15542: Change for the German style address format
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 58aa52698815fa67f0e4c925330b1e4ebe6bade0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 .../prog/en/includes/member-display-address-style-de.inc    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
index 9524a5a581..3d65a4228a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
@@ -1,6 +1,10 @@
 [% IF ( address or address2 ) %]
     [% IF ( address ) %]
-        <li class="patronaddress1">[% address %][%if (roadtype) %] [% roadtype %][% end %][% if (streetnumber) %] [% streetnumber %][% end %]</li>
+        [% SET roadtype_desc = '' %]
+        [% IF streettype %]
+            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
+        [% END %]
+        <li class="patronaddress1">[% address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF streetnumber %] [% streetnumber %][% END %]</li>
     [% END %]
     [% IF ( address2 ) %]
         <li class="patronaddress2">[% address2 %]</li>
-- 
2.39.5