Merge branch 'dev' into 'master'

#478: add the 'footer' translation slug for the email layout

See merge request cooperatic/kohinos!5

templates/email/admin_add_adherent.html.twig

@@ -10,12 +10,12 @@
 		{{ 'add_adherent.title'|trans({}, 'mails')|raw }}
 	</h2>
 
-	<p>
-	{{ 'add_adherent.welcome'|trans({}, 'mails')|raw }}
-	</p>
+	<div style="margin-bottom: 15px;">
+		{{ 'add_adherent.welcome'|trans({}, 'mails')|raw }}
+	</div>
 
 	<p>
-	{{ 'add_adherent.confirm'|trans({}, 'mails')|raw }}
+		{{ 'add_adherent.confirm'|trans({}, 'mails')|raw }}
 		<br/>
 		<a href='{{confirmationUrl}}'>{{confirmationUrl}}</a>
 	</p>

templates/email/email_layout.html.twig

@@ -20,7 +20,7 @@
         <!-- content -->
         <div style="display: block; margin: 0 auto; max-width: 600px;">
         <table style="width: 100%;">
-          
+
           <tr>
             <td>
             {% block main %}
@@ -30,21 +30,19 @@
               </h2>
               {% endblock title%}
               <br/>
-              {% block content %}
-              
-              {% endblock content %}
-    
+              {% block content %}{% endblock content %}
+
               {% block footer%}
-              <p>{{ KOH_MLC_NAME }}</p>
+	              {{ 'footer'|trans({}, 'mails')|raw }}
               {% endblock footer%}
             {% endblock main %}
             </td>
           </tr>
-          
+
         </table>
         </div>
         <!-- /content -->
-        
+
       </td>
       <td></td>
     </tr>

translations/mails.fr.yaml

+footer: ''
+
 add_adherent:
     title: Valider la création de votre compte
     welcome: Un administreur a créé votre nouveau compte MLC