Fix flash messages from FOSUserBundle not being translated, fixes #219

app/Resources/FOSUserBundle/views/layout.html.twig

@@ -1,15 +1,6 @@
 {% extends 'PackagistWebBundle::layout.html.twig' %}
 
 {% block content %}
-
-    {% for type, flashMessages in app.session.flashbag.all() %}
-        {% for flashMessage in flashMessages %}
-            <div class="box clearfix {{ type }}" style="margin-bottom: 5px;">
-                <p>{{ flashMessage|trans({}, 'FOSUserBundle') }}</p>
-            </div>
-        {% endfor %}
-    {% endfor %}
-
     <div class="box clearfix">
         {% block fos_user_content %}{% endblock %}
     </div>

src/Packagist/WebBundle/Resources/views/layout.html.twig

@@ -61,9 +61,15 @@
             <div class="main" role="main">
                 {% for type, flashMessages in app.session.flashbag.all() %}
                     {% for flashMessage in flashMessages %}
-                        <div class="flash-message {{ type }}">
-                            <p>{{ flashMessage }}</p>
-                        </div>
+                        {% if 'fos_user_' in type %}
+                            <div class="flash-message {{ type|replace({'fos_user_': ''}) }}">
+                                <p>{{ flashMessage|trans({}, 'FOSUserBundle') }}</p>
+                            </div>
+                        {% else %}
+                            <div class="flash-message {{ type }}">
+                                <p>{{ flashMessage }}</p>
+                            </div>
+                        {% endif %}
                     {% endfor %}
                 {% endfor %}