kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FOS flashes are in separate translation domain

Browse source
This commit is contained in:
umpirsky 2013-06-13 14:30:05 +02:00
parent 8d72661d84
commit d0be323656
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
features/frontend/account_profile.feature
View file

@ -54,4 +54,4 @@ Feature: User account profile edition
And I fill in "Last name" with "Doe"
And I press "Save changes"
Then I should be on my account profile page
And I should see "Your personal information have been updated"
And I should see "The profile has been updated"

11
src/Sylius/Bundle/WebBundle/Resources/views/Frontend/Account/layout.html.twig
View file

@ -1,5 +1,16 @@
{% extends 'SyliusWebBundle:Frontend:layout.html.twig' %}
{% block flashes %}
{% for name, flashes in app.session.flashbag.all if name in ['success', 'error', 'fos_user_success'] %}
{% for flash in flashes %}
<div class="alert alert-{{ name == 'fos_user_success' ? 'success' : name }}">
<a class="close" data-dismiss="alert" href="#">×</a>
{{ flash|trans({}, 'FOSUserBundle') }}
</div>
{% endfor %}
{% endfor %}
{% endblock %}
{% block sidebar %}
{{ knp_menu_render('sylius.frontend.account', {'template': 'SyliusWebBundle:Frontend:menu.html.twig'}) }}
{% endblock sidebar %}

16
src/Sylius/Bundle/WebBundle/Resources/views/Frontend/layout.html.twig
View file

@ -39,14 +39,16 @@
<h1 class="logo"><a href="{{ path('sylius_homepage') }}" title="{{ 'sylius.logo'|trans }}"><img src="{{ asset('assets/img/logo.png') }}" alt="{{ 'sylius.logo'|trans }}"><span>{{ 'sylius.logo'|trans }}</span></a></h1>
{% endblock %}
{% for name, flashes in app.session.flashbag.all if name in ['success', 'error', 'fos_user_success'] %}
{% for flash in flashes %}
<div class="alert alert-{{ name == 'fos_user_success' ? 'success' : name }}">
<a class="close" data-dismiss="alert" href="#">×</a>
{{ flash|trans }}
</div>
{% block flashes %}
{% for name, flashes in app.session.flashbag.all if name in ['success', 'error', 'fos_user_success'] %}
{% for flash in flashes %}
<div class="alert alert-{{ name == 'fos_user_success' ? 'success' : name }}">
<a class="close" data-dismiss="alert" href="#">×</a>
{{ flash|trans }}
</div>
{% endfor %}
{% endfor %}
{% endfor %}
{% endblock %}
<hr>
<div class="row-fluid">