From 7c65351462310b6c4cdb4f8ea8688ea0deb0bc07 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Wed, 14 Aug 2019 15:49:04 +0200
Subject: [PATCH] format FC address from detail fields (#35406)

---
 templates/authentic2/accounts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/authentic2/accounts.html b/templates/authentic2/accounts.html
index ebcee55..abe1c4c 100644
--- a/templates/authentic2/accounts.html
+++ b/templates/authentic2/accounts.html
@@ -128,7 +128,7 @@
       {% if user.fc_accounts.all.0.get_user_info.address %}
         <li>
           <span class="field-label">ADRESSE FOURNIE PAR FRANCECONNECT</span>
-          <span class="field-value">{% firstof user.fc_accounts.all.0.get_user_info.address.formatted user.fc_accounts.all.0.get_user_info.address %}</span>
+          <span class="field-value">{% with address=user.fc_accounts.all.0.get_user_info.address %}{% if address %}{{ address.street_address }}, {{ address.postal_code }} {{ address.locality }}{% if address.country and address.country.upper != "FRANCE" %}, {{ address.country }}{% endif %}{% endif %}{% endwith %}</span>
         </li>
         {% else %}
       <li class="center nodata{% if user.fc_accounts.all.0.get_user_info.address %} hidden {% else %}{% for key, values in profile %}{% if key == "Numéro sur la voie" or key == "Nom de la voie" or key == "Complément d'adresse" or key == "Code postal" or key == "Nom de la commune" or key == "Pays" %} hidden{% endif %}{% endfor %}{% endif %}">Non renseigné</li>