Merge branch 'dev' into 'master'

#468: fix translations in 'email/admin_add_adherent' template

See merge request cooperatic/kohinos!4

templates/email/admin_add_adherent.html.twig

@@ -7,19 +7,19 @@
 
 {% block content %}
 	<h2 style="font-size: 18px; color: #111111; font-family: 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; font-weight: bold; line-height: 1.2em; margin: 40px 0;">
-		{{ 'mails.add_adherent.title'|trans|raw }}
+		{{ 'add_adherent.title'|trans({}, 'mails')|raw }}
 	</h2>
 
 	<p>
-		{{ 'mails.add_adherent.welcome'|trans|raw }}
+	{{ 'add_adherent.welcome'|trans({}, 'mails')|raw }}
 	</p>
 
 	<p>
-		{{ 'mails.add_adherent.confirm'|trans|raw }}
+	{{ 'add_adherent.confirm'|trans({}, 'mails')|raw }}
 		<br/>
 		<a href='{{confirmationUrl}}'>{{confirmationUrl}}</a>
 	</p>
 
-	{{ 'mails.add_adherent.footer'|trans|raw }}
+	{{ 'add_adherent.footer'|trans({}, 'mails')|raw }}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}